diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3c4b0ef2b7..95d1744b64 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -776,7 +776,7 @@ BattleScript_EffectPhotonGeyser: goto BattleScript_MoveEnd BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko - jumpifspecies BS_ATTACKER, SPECIES_MORPEKO, BattleScript_EffectSpeedUpHit + jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_FULL_BELLY, BattleScript_EffectSpeedUpHit jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectSpeedUpHit printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE waitmessage B_WAIT_TIME_LONG @@ -891,7 +891,7 @@ BattleScript_BothCanNoLongerEscape:: BattleScript_EffectHyperspaceFury: jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound - jumpifspecies BS_ATTACKER, SPECIES_HOOPA, BattleScript_ButHoopaCantUseIt + jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 1890070453..d0236087aa 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -305,6 +305,7 @@ #define EVO_SCRIPT_TRIGGER_DMG 36 // Pokémon has specified HP below max, then player interacts trigger #define EVO_DARK_SCROLL 37 // interacts with Scroll of Darkness #define EVO_WATER_SCROLL 38 // interacts with Scroll of Waters +#define EVO_ALCREMIE 39 // TODO: read separate lookup table from gEvolutionTable. #define EVOS_PER_MON 10 diff --git a/include/constants/species.h b/include/constants/species.h index 0efb9160a6..dd10d541ab 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -426,9 +426,9 @@ #define SPECIES_DEOXYS_ATTACK 417 #define SPECIES_DEOXYS_DEFENSE 418 #define SPECIES_DEOXYS_SPEED 419 -// XD: Gale of Darkness +// XD: Gale of Darkness (New Forms) #define SPECIES_LUGIA_SHADOW 420 // Todo -// Diamond and Pearl +// Diamond and Pearl (New Species) #define SPECIES_TURTWIG 421 #define SPECIES_GROTLE 422 #define SPECIES_TORTERRA 423 @@ -567,7 +567,7 @@ #define SPECIES_ARCEUS_ICE 548 #define SPECIES_ARCEUS_DRAGON 549 #define SPECIES_ARCEUS_DARK 550 -// Platinum +// Platinum (New Forms) #define SPECIES_ROTOM_HEAT 551 #define SPECIES_ROTOM_WASH 552 #define SPECIES_ROTOM_FROST 553 @@ -575,7 +575,7 @@ #define SPECIES_ROTOM_MOW 555 #define SPECIES_GIRATINA_ORIGIN 556 #define SPECIES_SHAYMIN_SKY 557 -// HeartGold and SoulSilver +// HeartGold and SoulSilver (New Forms) #define SPECIES_PICHU_SPIKY_EARED 558 // Black and White #define SPECIES_VICTINI 559 @@ -756,14 +756,14 @@ #define SPECIES_GENESECT_SHOCK_DRIVE 725 #define SPECIES_GENESECT_BURN_DRIVE 726 #define SPECIES_GENESECT_CHILL_DRIVE 727 -// Black 2 and White 2 +// Black 2 and White 2 (New Forms) #define SPECIES_TORNADUS_THERIAN 728 #define SPECIES_THUNDURUS_THERIAN 729 #define SPECIES_LANDORUS_THERIAN 730 #define SPECIES_KYUREM_WHITE 731 #define SPECIES_KYUREM_BLACK 732 #define SPECIES_KELDEO_RESOLUTE 733 -// X and Y +// X and Y (New Species) #define SPECIES_CHESPIN 734 #define SPECIES_QUILLADIN 735 #define SPECIES_CHESNAUGHT 736 @@ -843,7 +843,8 @@ #define SPECIES_MEOWSTIC_FEMALE 804 #define SPECIES_HONEDGE 805 #define SPECIES_DOUBLADE 806 -#define SPECIES_AEGISLASH 807 +#define SPECIES_AEGISLASH SPECIES_AEGISLASH_SHIELD +#define SPECIES_AEGISLASH_SHIELD 807 #define SPECIES_AEGISLASH_BLADE 808 #define SPECIES_SPRITZEE 809 #define SPECIES_AROMATISSE 810 @@ -891,10 +892,13 @@ #define SPECIES_XERNEAS_NEUTRAL 849 #define SPECIES_XERNEAS_ACTIVE 850 #define SPECIES_YVELTAL 851 -#define SPECIES_ZYGARDE 852 +#define SPECIES_ZYGARDE SPECIES_ZYGARDE_50 +#define SPECIES_ZYGARDE_50 852 #define SPECIES_DIANCIE 853 -#define SPECIES_HOOPA 854 +#define SPECIES_HOOPA SPECIES_HOOPA_CONFINED +#define SPECIES_HOOPA_CONFINED 854 #define SPECIES_VOLCANION 855 +// X and Y (New Forms) #define SPECIES_VENUSAUR_MEGA 856 #define SPECIES_CHARIZARD_MEGA_X 857 #define SPECIES_CHARIZARD_MEGA_Y 858 @@ -926,7 +930,7 @@ #define SPECIES_LUCARIO_MEGA 884 #define SPECIES_ABOMASNOW_MEGA 885 #define SPECIES_ARCEUS_FAIRY 886 -// Omega Ruby and Alpha Sapphire +// Omega Ruby and Alpha Sapphire (New Forms) #define SPECIES_BEEDRILL_MEGA 887 #define SPECIES_PIDGEOT_MEGA 888 #define SPECIES_PIKACHU_COSPLAY 889 @@ -954,7 +958,7 @@ #define SPECIES_AUDINO_MEGA 911 #define SPECIES_DIANCIE_MEGA 912 #define SPECIES_HOOPA_UNBOUND 913 -// Sun and Moon +// Sun and Moon (New Species) #define SPECIES_ROWLET 914 #define SPECIES_DARTRIX 915 #define SPECIES_DECIDUEYE 916 @@ -974,16 +978,19 @@ #define SPECIES_VIKAVOLT 930 #define SPECIES_CRABRAWLER 931 #define SPECIES_CRABOMINABLE 932 -#define SPECIES_ORICORIO 933 +#define SPECIES_ORICORIO SPECIES_ORICORIO_BAILE +#define SPECIES_ORICORIO_BAILE 933 #define SPECIES_ORICORIO_POM_POM 934 #define SPECIES_ORICORIO_PAU 935 #define SPECIES_ORICORIO_SENSU 936 #define SPECIES_CUTIEFLY 937 #define SPECIES_RIBOMBEE 938 #define SPECIES_ROCKRUFF 939 -#define SPECIES_LYCANROC 940 +#define SPECIES_LYCANROC SPECIES_LYCANROC_MIDDAY +#define SPECIES_LYCANROC_MIDDAY 940 #define SPECIES_LYCANROC_MIDNIGHT 941 -#define SPECIES_WISHIWASHI 942 +#define SPECIES_WISHIWASHI SPECIES_WISHIWASHI_SOLO +#define SPECIES_WISHIWASHI_SOLO 942 #define SPECIES_WISHIWASHI_SCHOOL 943 #define SPECIES_MAREANIE 944 #define SPECIES_TOXAPEX 945 @@ -1011,7 +1018,8 @@ #define SPECIES_PALOSSAND 967 #define SPECIES_PYUKUMUKU 968 #define SPECIES_TYPE_NULL 969 -#define SPECIES_SILVALLY 970 +#define SPECIES_SILVALLY SPECIES_SILVALLY_NORMAL +#define SPECIES_SILVALLY_NORMAL 970 #define SPECIES_SILVALLY_FIGHTING 971 #define SPECIES_SILVALLY_FLYING 972 #define SPECIES_SILVALLY_POISON 973 @@ -1029,7 +1037,8 @@ #define SPECIES_SILVALLY_DRAGON 985 #define SPECIES_SILVALLY_DARK 986 #define SPECIES_SILVALLY_FAIRY 987 -#define SPECIES_MINIOR 988 +#define SPECIES_MINIOR SPECIES_MINIOR_METEOR_RED +#define SPECIES_MINIOR_METEOR_RED 988 #define SPECIES_MINIOR_METEOR_ORANGE 989 #define SPECIES_MINIOR_METEOR_YELLOW 990 #define SPECIES_MINIOR_METEOR_GREEN 991 @@ -1046,7 +1055,8 @@ #define SPECIES_KOMALA 1002 #define SPECIES_TURTONATOR 1003 #define SPECIES_TOGEDEMARU 1004 -#define SPECIES_MIMIKYU 1005 +#define SPECIES_MIMIKYU SPECIES_MIMIKYU_DISGUISED +#define SPECIES_MIMIKYU_DISGUISED 1005 #define SPECIES_MIMIKYU_BUSTED 1006 #define SPECIES_BRUXISH 1007 #define SPECIES_DRAMPA 1008 @@ -1073,6 +1083,7 @@ #define SPECIES_MAGEARNA 1029 #define SPECIES_MAGEARNA_ORIGINAL_COLOR 1030 #define SPECIES_MARSHADOW 1031 +// Sun and Moon (New Forms) #define SPECIES_RATTATA_ALOLAN 1032 #define SPECIES_RATICATE_ALOLAN 1033 #define SPECIES_PIKACHU_ORIGINAL_CAP 1034 @@ -1103,24 +1114,26 @@ #define SPECIES_ZYGARDE_10_POWER_CONSTRUCT 1059 #define SPECIES_ZYGARDE_50_POWER_CONSTRUCT 1060 #define SPECIES_ZYGARDE_COMPLETE 1061 -// Ultra Sun and Ultra Moon +// Ultra Sun and Ultra Moon (New Species) #define SPECIES_POIPOLE 1062 #define SPECIES_NAGANADEL 1063 #define SPECIES_STAKATAKA 1064 #define SPECIES_BLACEPHALON 1065 #define SPECIES_ZERAORA 1066 +// Ultra Sun and Ultra Moon (New Forms) #define SPECIES_PIKACHU_PARTNER_CAP 1067 #define SPECIES_ROCKRUFF_OWN_TEMPO 1068 #define SPECIES_LYCANROC_DUSK 1069 #define SPECIES_NECROZMA_DUSK_MANE 1070 #define SPECIES_NECROZMA_DAWN_WINGS 1071 #define SPECIES_NECROZMA_ULTRA 1072 -// Let's Go Pikachu and Eevee +// Let's Go Pikachu and Eevee (New Species) #define SPECIES_MELTAN 1073 #define SPECIES_MELMETAL 1074 +// Let's Go Pikachu and Eevee (New Forms) #define SPECIES_PIKACHU_PARTNER 1075 // Todo #define SPECIES_EEVEE_PARTNER 1076 // Todo -// Sword and Shield +// Sword and Shield (New Species) #define SPECIES_GROOKEY 1077 #define SPECIES_THWACKEY 1078 #define SPECIES_RILLABOOM 1079 @@ -1361,6 +1374,7 @@ #define SPECIES_ZAMAZENTA_CROWNED_SHIELD 1305 #define SPECIES_ETERNATUS 1306 #define SPECIES_ETERNATUS_ETERNAMAX 1307 +// Sword and Shield (New Forms) #define SPECIES_CHARIZARD_GIGANTAMAX 1308 #define SPECIES_BUTTERFREE_GIGANTAMAX 1309 #define SPECIES_PIKACHU_WORLD_CAP 1310 @@ -1382,15 +1396,16 @@ #define SPECIES_ZIGZAGOON_GALARIAN 1326 #define SPECIES_LINOONE_GALARIAN 1327 #define SPECIES_DARUMAKA_GALARIAN 1328 -#define SPECIES_DARMANITAN_GALARIAN 1329 +#define SPECIES_DARMANITAN_GALARIAN SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE +#define SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE 1329 #define SPECIES_DARMANITAN_GALARIAN_ZEN_MODE 1330 #define SPECIES_YAMASK_GALARIAN 1331 #define SPECIES_GARBODOR_GIGANTAMAX 1332 #define SPECIES_STUNFISK_GALARIAN 1333 #define SPECIES_MELMETAL_GIGANTAMAX 1334 -// Sword and Shield 1.1.0 +// Sword and Shield 1.1.0 (New Forms) #define SPECIES_SLOWPOKE_GALARIAN 1335 -// The Isle of Armor +// The Isle of Armor (New Species) #define SPECIES_KUBFU 1336 #define SPECIES_URSHIFU SPECIES_URSHIFU_SINGLE_STRIKE_STYLE #define SPECIES_URSHIFU_SINGLE_STRIKE_STYLE 1337 @@ -1399,13 +1414,14 @@ #define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX 1340 #define SPECIES_ZARUDE 1341 #define SPECIES_ZARUDE_DADA 1342 +// The Isle of Armor (New Forms) #define SPECIES_VENUSAUR_GIGANTAMAX 1343 #define SPECIES_BLASTOISE_GIGANTAMAX 1344 #define SPECIES_SLOWBRO_GALARIAN 1345 #define SPECIES_RILLABOOM_GIGANTAMAX 1346 #define SPECIES_CINDERACE_GIGANTAMAX 1347 #define SPECIES_INTELEON_GIGANTAMAX 1348 -// The Crown Tundra +// The Crown Tundra (New Species) #define SPECIES_REGIELEKI 1349 #define SPECIES_REGIDRAGO 1350 #define SPECIES_GLASTRIER 1351 @@ -1413,11 +1429,12 @@ #define SPECIES_CALYREX 1353 #define SPECIES_CALYREX_ICE_RIDER 1354 #define SPECIES_CALYREX_SHADOW_RIDER 1355 +// The Crown Tundra (New Forms) #define SPECIES_ARTICUNO_GALARIAN 1356 #define SPECIES_ZAPDOS_GALARIAN 1357 #define SPECIES_MOLTRES_GALARIAN 1358 #define SPECIES_SLOWKING_GALARIAN 1359 -// Legends: Arceus +// Legends: Arceus (New Species) #define SPECIES_WYRDEER 1360 #define SPECIES_KLEAVOR 1361 #define SPECIES_URSALUNA 1362 @@ -1427,6 +1444,7 @@ #define SPECIES_ENAMORUS SPECIES_ENAMORUS_INCARNATE #define SPECIES_ENAMORUS_INCARNATE 1366 #define SPECIES_ENAMORUS_THERIAN 1367 +// Legends: Arceus (New Forms) #define SPECIES_GROWLITHE_HISUIAN 1368 #define SPECIES_ARCANINE_HISUIAN 1369 #define SPECIES_VOLTORB_HISUIAN 1370 diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 312ff853ca..8e9d4b430b 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -3742,7 +3742,6 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score) ProtectChecks(battlerAtk, battlerDef, move, predictedMove, &score); break; case MOVE_KINGS_SHIELD: - #if (defined SPECIES_AEGISLASH && defined SPECIES_AEGISLASH_BLADE) if (AI_DATA->abilities[battlerAtk] == ABILITY_STANCE_CHANGE //Special logic for Aegislash && gBattleMons[battlerAtk].species == SPECIES_AEGISLASH_BLADE && !IsBattlerIncapacitated(battlerDef, AI_DATA->abilities[battlerDef])) @@ -3750,7 +3749,6 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score) score += 3; break; } - #endif //fallthrough default: // protect ProtectChecks(battlerAtk, battlerDef, move, predictedMove, &score); @@ -4409,15 +4407,13 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score) score += 3; break; case EFFECT_RELIC_SONG: - #if (defined SPECIES_MELOETTA && defined SPECIES_MELOETTA_PIROUETTE) if (!(gBattleMons[battlerAtk].status2 & STATUS2_TRANSFORMED)) // Don't try to change form if it's transformed. { - if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA && gBattleMons[battlerDef].defense < gBattleMons[battlerDef].spDefense) + if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA_ARIA && gBattleMons[battlerDef].defense < gBattleMons[battlerDef].spDefense) score += 3; // Change to Pirouette if can do more damage else if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA_PIROUETTE && gBattleMons[battlerDef].spDefense < gBattleMons[battlerDef].defense) score += 3; // Change to Aria if can do more damage } - #endif break; case EFFECT_ELECTRIC_TERRAIN: case EFFECT_MISTY_TERRAIN: diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index e1654eb30c..eba98cd872 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -3638,9 +3638,9 @@ bool32 ShouldUseZMove(u8 battlerAtk, u8 battlerDef, u16 chosenMove) { u8 effectiveness; - if (gBattleMons[battlerDef].ability == ABILITY_DISGUISE && gBattleMons[battlerDef].species == SPECIES_MIMIKYU) + if (gBattleMons[battlerDef].ability == ABILITY_DISGUISE && gBattleMons[battlerDef].species == SPECIES_MIMIKYU_DISGUISED) return FALSE; // Don't waste a Z-Move busting disguise - if (gBattleMons[battlerDef].ability == ABILITY_ICE_FACE && gBattleMons[battlerDef].species == SPECIES_EISCUE && IS_MOVE_PHYSICAL(chosenMove)) + if (gBattleMons[battlerDef].ability == ABILITY_ICE_FACE && gBattleMons[battlerDef].species == SPECIES_EISCUE_ICE_FACE && IS_MOVE_PHYSICAL(chosenMove)) return FALSE; // Don't waste a Z-Move busting Ice Face if (IS_MOVE_STATUS(chosenMove) && !IS_MOVE_STATUS(gBattleStruct->zmove.chosenZMove)) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 09e97dfb21..adda111dc2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1345,7 +1345,7 @@ static bool32 TryAegiFormChange(void) { default: return FALSE; - case SPECIES_AEGISLASH: // Shield -> Blade + case SPECIES_AEGISLASH_SHIELD: // Shield -> Blade if (IS_MOVE_STATUS(gCurrentMove)) return FALSE; gBattleMons[gBattlerAttacker].species = SPECIES_AEGISLASH_BLADE; @@ -1353,7 +1353,7 @@ static bool32 TryAegiFormChange(void) case SPECIES_AEGISLASH_BLADE: // Blade -> Shield if (gCurrentMove != MOVE_KINGS_SHIELD) return FALSE; - gBattleMons[gBattlerAttacker].species = SPECIES_AEGISLASH; + gBattleMons[gBattlerAttacker].species = SPECIES_AEGISLASH_SHIELD; break; } @@ -3581,14 +3581,14 @@ void SetMoveEffect(bool32 primary, u32 certain) case MOVE_EFFECT_RELIC_SONG: if (GetBattlerAbility(gBattlerAttacker) != ABILITY_SHEER_FORCE && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED)) { - if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA) + if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA_ARIA) { gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA_PIROUETTE; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeMoveEffect); } else if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA_PIROUETTE) { - gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA; + gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA_ARIA; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeMoveEffect); } } @@ -8670,7 +8670,8 @@ static void Cmd_various(void) } return; case VARIOUS_TRY_REFLECT_TYPE: - if (gBattleMons[gBattlerTarget].species == SPECIES_ARCEUS || gBattleMons[gBattlerTarget].species == SPECIES_SILVALLY) + if (GET_BASE_SPECIES_ID(gBattleMons[gBattlerTarget].species) == SPECIES_ARCEUS + || GET_BASE_SPECIES_ID(gBattleMons[gBattlerTarget].species) == SPECIES_SILVALLY) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); } @@ -13596,7 +13597,7 @@ bool32 DoesSubstituteBlockMove(u8 battlerAtk, u8 battlerDef, u32 move) bool32 DoesDisguiseBlockMove(u8 battlerAtk, u8 battlerDef, u32 move) { - if (gBattleMons[battlerDef].species != SPECIES_MIMIKYU + if (gBattleMons[battlerDef].species != SPECIES_MIMIKYU_DISGUISED || gBattleMons[battlerDef].status2 & STATUS2_TRANSFORMED || IS_MOVE_STATUS(move) || gHitMarker & HITMARKER_IGNORE_DISGUISE diff --git a/src/battle_util.c b/src/battle_util.c index f39673fcb9..db2468b29e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4175,18 +4175,18 @@ static bool32 ShouldChangeFormHpBased(u32 battler) // Ability, form >, form <=, hp divided static const u16 forms[][4] = { - {ABILITY_ZEN_MODE, SPECIES_DARMANITAN, SPECIES_DARMANITAN_ZEN_MODE, 2}, - {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR, SPECIES_MINIOR_CORE_RED, 2}, - {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_BLUE, SPECIES_MINIOR_CORE_BLUE, 2}, - {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_GREEN, SPECIES_MINIOR_CORE_GREEN, 2}, - {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO, 2}, - {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE, 2}, - {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET, 2}, - {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW, 2}, - {ABILITY_SCHOOLING, SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI, 4}, - {ABILITY_GULP_MISSILE, SPECIES_CRAMORANT, SPECIES_CRAMORANT_GORGING, 2}, - {ABILITY_GULP_MISSILE, SPECIES_CRAMORANT, SPECIES_CRAMORANT_GULPING, 1}, - {ABILITY_ZEN_MODE, SPECIES_DARMANITAN_GALARIAN, SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, 2}, + {ABILITY_ZEN_MODE, SPECIES_DARMANITAN_STANDARD_MODE, SPECIES_DARMANITAN_ZEN_MODE, 2}, + {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_RED, SPECIES_MINIOR_CORE_RED, 2}, + {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_BLUE, SPECIES_MINIOR_CORE_BLUE, 2}, + {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_GREEN, SPECIES_MINIOR_CORE_GREEN, 2}, + {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO, 2}, + {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE, 2}, + {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET, 2}, + {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW, 2}, + {ABILITY_SCHOOLING, SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI_SOLO, 4}, + {ABILITY_GULP_MISSILE, SPECIES_CRAMORANT, SPECIES_CRAMORANT_GORGING, 2}, + {ABILITY_GULP_MISSILE, SPECIES_CRAMORANT, SPECIES_CRAMORANT_GULPING, 1}, + {ABILITY_ZEN_MODE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE, SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, 2}, }; u32 i; u16 battlerAbility = GetBattlerAbility(battler); @@ -4960,7 +4960,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3); break; case ABILITY_POWER_CONSTRUCT: - if ((gBattleMons[battler].species == SPECIES_ZYGARDE || gBattleMons[battler].species == SPECIES_ZYGARDE_10) + if ((gBattleMons[battler].species == SPECIES_ZYGARDE_50_POWER_CONSTRUCT + || gBattleMons[battler].species == SPECIES_ZYGARDE_10_POWER_CONSTRUCT) && gBattleMons[battler].hp <= gBattleMons[battler].maxHP / 2) { gBattleStruct->changedSpecies[gBattlerPartyIndexes[battler]] = gBattleMons[battler].species; @@ -4986,14 +4987,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move case ABILITY_HUNGER_SWITCH: if (!(gBattleMons[battler].status2 & STATUS2_TRANSFORMED)) { - if (gBattleMons[battler].species == SPECIES_MORPEKO) + if (gBattleMons[battler].species == SPECIES_MORPEKO_FULL_BELLY) { gBattleMons[battler].species = SPECIES_MORPEKO_HANGRY; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3NoPopup); } else if (gBattleMons[battler].species == SPECIES_MORPEKO_HANGRY) { - gBattleMons[battler].species = SPECIES_MORPEKO; + gBattleMons[battler].species = SPECIES_MORPEKO_FULL_BELLY; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3NoPopup); } effect++; @@ -9695,24 +9696,24 @@ void UndoFormChange(u32 monId, u32 side, bool32 isSwitchingOut) struct Pokemon *party = (side == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty; static const u16 species[][3] = { - // Changed Form ID Default Form ID Should change on switch - {SPECIES_MIMIKYU_BUSTED, SPECIES_MIMIKYU, FALSE}, - {SPECIES_GRENINJA_ASH, SPECIES_GRENINJA_BATTLE_BOND, FALSE}, - {SPECIES_MELOETTA_PIROUETTE, SPECIES_MELOETTA, FALSE}, - {SPECIES_AEGISLASH_BLADE, SPECIES_AEGISLASH, TRUE}, - {SPECIES_DARMANITAN_ZEN_MODE, SPECIES_DARMANITAN, TRUE}, - {SPECIES_MINIOR, SPECIES_MINIOR_CORE_RED, TRUE}, - {SPECIES_MINIOR_METEOR_BLUE, SPECIES_MINIOR_CORE_BLUE, TRUE}, - {SPECIES_MINIOR_METEOR_GREEN, SPECIES_MINIOR_CORE_GREEN, TRUE}, - {SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO, TRUE}, - {SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE, TRUE}, - {SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET, TRUE}, - {SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW, TRUE}, - {SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI, TRUE}, - {SPECIES_CRAMORANT_GORGING, SPECIES_CRAMORANT, TRUE}, - {SPECIES_CRAMORANT_GULPING, SPECIES_CRAMORANT, TRUE}, - {SPECIES_MORPEKO_HANGRY, SPECIES_MORPEKO, TRUE}, - {SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, SPECIES_DARMANITAN_GALARIAN, TRUE}, + // Changed Form ID Default Form ID Should change on switch + {SPECIES_MIMIKYU_BUSTED, SPECIES_MIMIKYU_DISGUISED, FALSE}, + {SPECIES_GRENINJA_ASH, SPECIES_GRENINJA_BATTLE_BOND, FALSE}, + {SPECIES_MELOETTA_PIROUETTE, SPECIES_MELOETTA_ARIA, FALSE}, + {SPECIES_AEGISLASH_BLADE, SPECIES_AEGISLASH_SHIELD, TRUE}, + {SPECIES_DARMANITAN_ZEN_MODE, SPECIES_DARMANITAN_STANDARD_MODE, TRUE}, + {SPECIES_MINIOR_METEOR_RED, SPECIES_MINIOR_CORE_RED, TRUE}, + {SPECIES_MINIOR_METEOR_BLUE, SPECIES_MINIOR_CORE_BLUE, TRUE}, + {SPECIES_MINIOR_METEOR_GREEN, SPECIES_MINIOR_CORE_GREEN, TRUE}, + {SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO, TRUE}, + {SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE, TRUE}, + {SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET, TRUE}, + {SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW, TRUE}, + {SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI_SOLO, TRUE}, + {SPECIES_CRAMORANT_GORGING, SPECIES_CRAMORANT, TRUE}, + {SPECIES_CRAMORANT_GULPING, SPECIES_CRAMORANT, TRUE}, + {SPECIES_MORPEKO_HANGRY, SPECIES_MORPEKO_FULL_BELLY, TRUE}, + {SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE, TRUE}, }; currSpecies = GetMonData(&party[monId], MON_DATA_SPECIES, NULL); diff --git a/src/battle_z_move.c b/src/battle_z_move.c index c257df5990..d0878c89dd 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -64,19 +64,17 @@ static const struct SignatureZMove sSignatureZMoves[] = {SPECIES_PIKACHU_POP_STAR, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA}, {SPECIES_PIKACHU_PH_D, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA}, {SPECIES_PIKACHU_LIBRE, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA}, - {SPECIES_RAICHU_ALOLAN, ITEM_ALORAICHIUM_Z, MOVE_THUNDERBOLT, MOVE_STOKED_SPARKSURFER}, {SPECIES_DECIDUEYE, ITEM_DECIDIUM_Z, MOVE_SPIRIT_SHACKLE, MOVE_SINISTER_ARROW_RAID}, {SPECIES_INCINEROAR, ITEM_INCINIUM_Z, MOVE_DARKEST_LARIAT, MOVE_MALICIOUS_MOONSAULT}, {SPECIES_KOMMO_O, ITEM_KOMMONIUM_Z, MOVE_CLANGING_SCALES, MOVE_CLANGOROUS_SOULBLAZE}, {SPECIES_LUNALA, ITEM_LUNALIUM_Z, MOVE_MOONGEIST_BEAM, MOVE_MENACING_MOONRAZE_MAELSTROM}, {SPECIES_NECROZMA_DAWN_WINGS, ITEM_LUNALIUM_Z, MOVE_MOONGEIST_BEAM, MOVE_MENACING_MOONRAZE_MAELSTROM}, - {SPECIES_LYCANROC, ITEM_LYCANIUM_Z, MOVE_STONE_EDGE, MOVE_SPLINTERED_STORMSHARDS}, + {SPECIES_LYCANROC_MIDDAY, ITEM_LYCANIUM_Z, MOVE_STONE_EDGE, MOVE_SPLINTERED_STORMSHARDS}, {SPECIES_LYCANROC_MIDNIGHT, ITEM_LYCANIUM_Z, MOVE_STONE_EDGE, MOVE_SPLINTERED_STORMSHARDS}, - {SPECIES_LYCANROC_DUSK, ITEM_LYCANIUM_Z, MOVE_STONE_EDGE, MOVE_SPLINTERED_STORMSHARDS}, {SPECIES_MARSHADOW, ITEM_MARSHADIUM_Z, MOVE_SPECTRAL_THIEF, MOVE_SOUL_STEALING_7_STAR_STRIKE}, - {SPECIES_MIMIKYU, ITEM_MIMIKIUM_Z, MOVE_PLAY_ROUGH, MOVE_LETS_SNUGGLE_FOREVER}, + {SPECIES_MIMIKYU_DISGUISED, ITEM_MIMIKIUM_Z, MOVE_PLAY_ROUGH, MOVE_LETS_SNUGGLE_FOREVER}, {SPECIES_MIMIKYU_BUSTED, ITEM_MIMIKIUM_Z, MOVE_PLAY_ROUGH, MOVE_LETS_SNUGGLE_FOREVER}, {SPECIES_PIKACHU_ORIGINAL_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, {SPECIES_PIKACHU_HOENN_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index e51574fb35..0577700c6a 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -6,933 +6,6 @@ #define FLIP 0 #define NO_FLIP 1 -#if P_UPDATED_STATS >= GEN_6 - #define PIKACHU_BASE_DEFENSES\ - .baseDefense = 40, \ - .baseSpDefense = 50 -#else - #define PIKACHU_BASE_DEFENSES\ - .baseDefense = 30, \ - .baseSpDefense = 40 -#endif - -#define PIKACHU_BASE_STATS(gender, flip) \ - { \ - .baseHP = 35, \ - .baseAttack = 55, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - PIKACHU_BASE_DEFENSES, \ - .type1 = TYPE_ELECTRIC, \ - .type2 = TYPE_ELECTRIC, \ - .catchRate = 190, \ - .expYield = 112, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .genderRatio = gender, \ - .eggCycles = 10, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FIELD, \ - .eggGroup2 = EGG_GROUP_FAIRY, \ - .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD},\ - .bodyColor = BODY_COLOR_YELLOW, \ - .noFlip = flip, \ - } - -#define COSPLAY_PIKACHU_BASE_STATS(flip) PIKACHU_BASE_STATS(MON_FEMALE, flip) -#define CAP_PIKACHU_BASE_STATS(flip) PIKACHU_BASE_STATS(MON_MALE, flip) - -#define PICHU_BASE_STATS(flip) \ - { \ - .baseHP = 20, \ - .baseAttack = 40, \ - .baseDefense = 15, \ - .baseSpeed = 60, \ - .baseSpAttack = 35, \ - .baseSpDefense = 35, \ - .type1 = TYPE_ELECTRIC, \ - .type2 = TYPE_ELECTRIC, \ - .catchRate = 190, \ - .expYield = 41, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 10, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD},\ - .bodyColor = BODY_COLOR_YELLOW, \ - .noFlip = flip, \ - } - -#define UNOWN_BASE_STATS(flip) \ - { \ - .baseHP = 48, \ - .baseAttack = 72, \ - .baseDefense = 48, \ - .baseSpeed = 48, \ - .baseSpAttack = 72, \ - .baseSpDefense = 48, \ - .type1 = TYPE_PSYCHIC, \ - .type2 = TYPE_PSYCHIC, \ - .catchRate = 225, \ - .expYield = 118, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 40, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ABILITY_LEVITATE, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_BLACK, \ - .noFlip = flip, \ - } - -#define CASTFORM_BASE_STATS(type, color) \ - { \ - .baseHP = 70, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 70, \ - .baseSpAttack = 70, \ - .baseSpDefense = 70, \ - .type1 = type, \ - .type2 = type, \ - .catchRate = 45, \ - .expYield = 147, \ - .evYield_HP = 1, \ - .itemCommon = ITEM_MYSTIC_WATER, \ - .itemRare = ITEM_MYSTIC_WATER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FAIRY, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_FORECAST, ABILITY_NONE},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define BURMY_BASE_STATS(color) \ - { \ - .baseHP = 40, \ - .baseAttack = 29, \ - .baseDefense = 45, \ - .baseSpeed = 36, \ - .baseSpAttack = 29, \ - .baseSpDefense = 45, \ - .type1 = TYPE_BUG, \ - .type2 = TYPE_BUG, \ - .catchRate = 120, \ - .expYield = 45, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_BUG, \ - .eggGroup2 = EGG_GROUP_BUG, \ - .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define CHERRIM_BASE_STATS(color) \ - { \ - .baseHP = 70, \ - .baseAttack = 60, \ - .baseDefense = 70, \ - .baseSpeed = 85, \ - .baseSpAttack = 87, \ - .baseSpDefense = 78, \ - .type1 = TYPE_GRASS, \ - .type2 = TYPE_GRASS, \ - .catchRate = 75, \ - .expYield = 158, \ - .evYield_SpAttack = 2, \ - .itemRare = ITEM_MIRACLE_SEED, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FAIRY, \ - .eggGroup2 = EGG_GROUP_GRASS, \ - .abilities = {ABILITY_FLOWER_GIFT, ABILITY_NONE},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define SHELLOS_BASE_STATS(color) \ - { \ - .baseHP = 76, \ - .baseAttack = 48, \ - .baseDefense = 48, \ - .baseSpeed = 34, \ - .baseSpAttack = 57, \ - .baseSpDefense = 62, \ - .type1 = TYPE_WATER, \ - .type2 = TYPE_WATER, \ - .catchRate = 190, \ - .expYield = 65, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_WATER_1, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define GASTRODON_BASE_STATS(color) \ - { \ - .baseHP = 111, \ - .baseAttack = 83, \ - .baseDefense = 68, \ - .baseSpeed = 39, \ - .baseSpAttack = 92, \ - .baseSpDefense = 82, \ - .type1 = TYPE_WATER, \ - .type2 = TYPE_GROUND, \ - .catchRate = 75, \ - .expYield = 166, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_WATER_1, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define ROTOM_FORM_BASE_STATS(type, flip) \ - { \ - .baseHP = 50, \ - .baseAttack = 65, \ - .baseDefense = 107, \ - .baseSpeed = 86, \ - .baseSpAttack = 105, \ - .baseSpDefense = 107, \ - .type1 = TYPE_ELECTRIC, \ - .type2 = type, \ - .catchRate = 45, \ - .expYield = 182, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_AMORPHOUS, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_LEVITATE, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_RED, \ - .noFlip = flip, \ - } - -#define ARCEUS_BASE_STATS(type) \ - { \ - .baseHP = 120, \ - .baseAttack = 120, \ - .baseDefense = 120, \ - .baseSpeed = 120, \ - .baseSpAttack = 120, \ - .baseSpDefense = 120, \ - .type1 = type, \ - .type2 = type, \ - .catchRate = 3, \ - .expYield = 324, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ABILITY_MULTITYPE, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = FALSE, \ - .flags = FLAG_MYTHICAL, \ - } - -#define BASCULIN_BASE_STATS(itemRare, ability1) \ - { \ - .baseHP = 70, \ - .baseAttack = 92, \ - .baseDefense = 65, \ - .baseSpeed = 98, \ - .baseSpAttack = 80, \ - .baseSpDefense = 55, \ - .type1 = TYPE_WATER, \ - .type2 = TYPE_WATER, \ - .catchRate = 25, \ - .expYield = 161, \ - .evYield_Speed = 161, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_WATER_2, \ - .eggGroup2 = EGG_GROUP_WATER_2, \ - .abilities = {ability1, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - } - -#define DEERLING_BASE_STATS(color) \ - { \ - .baseHP = 60, \ - .baseAttack = 60, \ - .baseDefense = 50, \ - .baseSpeed = 75, \ - .baseSpAttack = 40, \ - .baseSpDefense = 50, \ - .type1 = TYPE_NORMAL, \ - .type2 = TYPE_GRASS, \ - .catchRate = 190, \ - .expYield = 67, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FIELD, \ - .eggGroup2 = EGG_GROUP_FIELD, \ - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define SAWSBUCK_BASE_STATS \ - { \ - .baseHP = 80, \ - .baseAttack = 100, \ - .baseDefense = 70, \ - .baseSpeed = 95, \ - .baseSpAttack = 60, \ - .baseSpDefense = 70, \ - .type1 = TYPE_NORMAL, \ - .type2 = TYPE_GRASS, \ - .catchRate = 75, \ - .expYield = 166, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FIELD, \ - .eggGroup2 = EGG_GROUP_FIELD, \ - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE},\ - .bodyColor = BODY_COLOR_BROWN, \ - .noFlip = FALSE, \ - } - -#define GENESECT_BASE_STATS \ - { \ - .baseHP = 71, \ - .baseAttack = 120, \ - .baseDefense = 95, \ - .baseSpeed = 99, \ - .baseSpAttack = 120, \ - .baseSpDefense = 95, \ - .type1 = TYPE_BUG, \ - .type2 = TYPE_STEEL, \ - .catchRate = 3, \ - .expYield = 270, \ - .evYield_Attack = 1, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ABILITY_DOWNLOAD, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_PURPLE, \ - .noFlip = FALSE, \ - .flags = FLAG_MYTHICAL, \ - } - -#define VIVILLON_BASE_STATS(color) \ - { \ - .baseHP = 80, \ - .baseAttack = 52, \ - .baseDefense = 50, \ - .baseSpeed = 89, \ - .baseSpAttack = 90, \ - .baseSpDefense = 50, \ - .type1 = TYPE_BUG, \ - .type2 = TYPE_FLYING, \ - .catchRate = 45, \ - .expYield = 185, \ - .evYield_HP = 1, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_BUG, \ - .eggGroup2 = EGG_GROUP_BUG, \ - .abilities = {ABILITY_SHIELD_DUST, ABILITY_COMPOUND_EYES, ABILITY_FRIEND_GUARD},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define FLABEBE_BASE_STATS \ - { \ - .baseHP = 44, \ - .baseAttack = 38, \ - .baseDefense = 39, \ - .baseSpeed = 42, \ - .baseSpAttack = 61, \ - .baseSpDefense = 79, \ - .type1 = TYPE_FAIRY, \ - .type2 = TYPE_FAIRY, \ - .catchRate = 225, \ - .expYield = 61, \ - .evYield_SpDefense = 1, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FAIRY, \ - .eggGroup2 = EGG_GROUP_FAIRY, \ - .abilities = {ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS},\ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = FALSE, \ - } - -#define FLOETTE_BASE_STATS \ - { \ - .baseHP = 54, \ - .baseAttack = 45, \ - .baseDefense = 47, \ - .baseSpeed = 52, \ - .baseSpAttack = 75, \ - .baseSpDefense = 98, \ - .type1 = TYPE_FAIRY, \ - .type2 = TYPE_FAIRY, \ - .catchRate = 120, \ - .expYield = 130, \ - .evYield_SpDefense = 2, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FAIRY, \ - .eggGroup2 = EGG_GROUP_FAIRY, \ - .abilities = {ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS},\ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = FALSE, \ - } - -#define FLORGES_BASE_STATS \ - { \ - .baseHP = 78, \ - .baseAttack = 65, \ - .baseDefense = 68, \ - .baseSpeed = 75, \ - .baseSpAttack = 112, \ - .baseSpDefense = 154, \ - .type1 = TYPE_FAIRY, \ - .type2 = TYPE_FAIRY, \ - .catchRate = 45, \ - .expYield = 248, \ - .evYield_SpDefense = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FAIRY, \ - .eggGroup2 = EGG_GROUP_FAIRY, \ - .abilities = {ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS},\ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = FALSE, \ - } - -#define FURFROU_BASE_STATS(flip) \ - { \ - .baseHP = 75, \ - .baseAttack = 80, \ - .baseDefense = 60, \ - .baseSpeed = 102, \ - .baseSpAttack = 65, \ - .baseSpDefense = 90, \ - .type1 = TYPE_NORMAL, \ - .type2 = TYPE_NORMAL, \ - .catchRate = 160, \ - .expYield = 165, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FIELD, \ - .eggGroup2 = EGG_GROUP_FIELD, \ - .abilities = {ABILITY_FUR_COAT, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = flip, \ - } - -#define PUMKPABOO_MISC_STATS \ - .type1 = TYPE_GHOST, \ - .type2 = TYPE_GRASS, \ - .catchRate = 120, \ - .expYield = 67, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_AMORPHOUS, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA},\ - .bodyColor = BODY_COLOR_BROWN, \ - .noFlip = FALSE - -#define GOURGEIST_MISC_STATS \ - .type1 = TYPE_GHOST, \ - .type2 = TYPE_GRASS, \ - .catchRate = 60, \ - .expYield = 173, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_AMORPHOUS, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA},\ - .bodyColor = BODY_COLOR_BROWN, \ - .noFlip = FALSE - -#define XERNEAS_BASE_STATS \ - { \ - .baseHP = 126, \ - .baseAttack = 131, \ - .baseDefense = 95, \ - .baseSpeed = 99, \ - .baseSpAttack = 131, \ - .baseSpDefense = 98, \ - .type1 = TYPE_FAIRY, \ - .type2 = TYPE_FAIRY, \ - .catchRate = 45, \ - .expYield = 306, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ABILITY_FAIRY_AURA, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_BLUE, \ - .noFlip = FALSE, \ - .flags = FLAG_LEGENDARY, \ - } - -#define ZYGARDE_50_BASE_STATS(ability) \ - { \ - .baseHP = 108, \ - .baseAttack = 100, \ - .baseDefense = 121, \ - .baseSpeed = 95, \ - .baseSpAttack = 81, \ - .baseSpDefense = 95, \ - .type1 = TYPE_DRAGON, \ - .type2 = TYPE_GROUND, \ - .catchRate = 3, \ - .expYield = 270, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ability, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = TRUE, \ - .flags = FLAG_LEGENDARY, \ - } - -#define ZYGARDE_10_BASE_STATS(ability) \ - { \ - .baseHP = 54, \ - .baseAttack = 100, \ - .baseDefense = 71, \ - .baseSpeed = 115, \ - .baseSpAttack = 61, \ - .baseSpDefense = 85, \ - .type1 = TYPE_DRAGON, \ - .type2 = TYPE_GROUND, \ - .catchRate = 3, \ - .expYield = 219, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ability, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_BLACK, \ - .noFlip = TRUE, \ - .flags = FLAG_LEGENDARY, \ - } - -#define ORICORIO_BASE_STATS(type, color) \ -{ \ - .baseHP = 75, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 93, \ - .baseSpAttack = 98, \ - .baseSpDefense = 70, \ - .type1 = type, \ - .type2 = TYPE_FLYING, \ - .catchRate = 45, \ - .expYield = 167, \ - .evYield_SpAttack = 2, \ - .itemRare = ITEM_HONEY, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FLYING, \ - .eggGroup2 = EGG_GROUP_FLYING, \ - .abilities = {ABILITY_DANCER, ABILITY_NONE},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define ROCKRUFF_BASE_STATS(ability1, ability2, hiddenAbility)\ - { \ - .baseHP = 45, \ - .baseAttack = 65, \ - .baseDefense = 40, \ - .baseSpeed = 60, \ - .baseSpAttack = 30, \ - .baseSpDefense = 40, \ - .type1 = TYPE_ROCK, \ - .type2 = TYPE_ROCK, \ - .catchRate = 190, \ - .expYield = 56, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FIELD, \ - .eggGroup2 = EGG_GROUP_FIELD, \ - .abilities = {ability1, ability2, hiddenAbility}, \ - .bodyColor = BODY_COLOR_BROWN, \ - .noFlip = FALSE, \ - } - -#define SILVALLY_BASE_STATS(type) \ - { \ - .baseHP = 95, \ - .baseAttack = 95, \ - .baseDefense = 95, \ - .baseSpeed = 95, \ - .baseSpAttack = 95, \ - .baseSpDefense = 95, \ - .type1 = type, \ - .type2 = type, \ - .catchRate = 3, \ - .expYield = 257, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ABILITY_RKS_SYSTEM, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_GRAY, \ - .noFlip = FALSE, \ - .flags = FLAG_LEGENDARY, \ - } - -#define MINIOR_METEOR_ATTRIBUTES\ - .baseHP = 60, \ - .baseAttack = 60, \ - .baseDefense = 100, \ - .baseSpeed = 60, \ - .baseSpAttack = 60, \ - .baseSpDefense = 100 - -#define MINIOR_CORE_ATTRIBUTES\ - .baseHP = 60, \ - .baseAttack = 100, \ - .baseDefense = 60, \ - .baseSpeed = 120, \ - .baseSpAttack = 100, \ - .baseSpDefense = 60 - -#define MINIOR_MISC_STATS(color) \ - .type1 = TYPE_ROCK, \ - .type2 = TYPE_FLYING, \ - .catchRate = 30, \ - .expYield = 154, \ - .evYield_Defense = 1, \ - .evYield_SpDefense = 1, \ - .itemRare = ITEM_STAR_PIECE, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 25, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroup1 = EGG_GROUP_MINERAL, \ - .eggGroup2 = EGG_GROUP_MINERAL, \ - .abilities = {ABILITY_SHIELDS_DOWN, ABILITY_NONE},\ - .bodyColor = color, \ - .noFlip = TRUE - -#define MINIOR_METEOR_BASE_STATS \ - { \ - MINIOR_METEOR_ATTRIBUTES, \ - MINIOR_MISC_STATS(BODY_COLOR_BROWN),\ - } - - -#define MINIOR_CORE_BASE_STATS(color)\ - { \ - MINIOR_CORE_ATTRIBUTES, \ - MINIOR_MISC_STATS(color), \ - } - -#define MIMIKYU_BASE_STATS \ - { \ - .baseHP = 55, \ - .baseAttack = 90, \ - .baseDefense = 80, \ - .baseSpeed = 96, \ - .baseSpAttack = 50, \ - .baseSpDefense = 105, \ - .type1 = TYPE_GHOST, \ - .type2 = TYPE_FAIRY, \ - .catchRate = 45, \ - .expYield = 167, \ - .evYield_SpDefense = 2, \ - .itemRare = ITEM_CHESTO_BERRY, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_AMORPHOUS, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_DISGUISE, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_YELLOW, \ - .noFlip = FALSE, \ - } - -#define MAGEARNA_BASE_STATS(color) \ - { \ - .baseHP = 80, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 65, \ - .baseSpAttack = 130, \ - .baseSpDefense = 115, \ - .type1 = TYPE_STEEL, \ - .type2 = TYPE_FAIRY, \ - .catchRate = 3, \ - .expYield = 270, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ABILITY_SOUL_HEART, ABILITY_NONE},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - .flags = FLAG_MYTHICAL, \ - } - -#define CRAMORANT_BASE_STATS \ - { \ - .baseHP = 70, \ - .baseAttack = 85, \ - .baseDefense = 55, \ - .baseSpeed = 85, \ - .baseSpAttack = 85, \ - .baseSpDefense = 95, \ - .type1 = TYPE_FLYING, \ - .type2 = TYPE_WATER, \ - .catchRate = 45, \ - .expYield = 166, \ - .evYield_SpDefense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_WATER_1, \ - .eggGroup2 = EGG_GROUP_FLYING, \ - .abilities = {ABILITY_GULP_MISSILE, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_BLUE, \ - .noFlip = FALSE, \ - } - -#define TOXTRICITY_BASE_STATS(ability2) \ - { \ - .baseHP = 75, \ - .baseAttack = 98, \ - .baseDefense = 70, \ - .baseSpeed = 75, \ - .baseSpAttack = 114, \ - .baseSpDefense = 70, \ - .type1 = TYPE_ELECTRIC, \ - .type2 = TYPE_POISON, \ - .catchRate = 45, \ - .expYield = 176, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroup1 = EGG_GROUP_HUMAN_LIKE, \ - .eggGroup2 = EGG_GROUP_HUMAN_LIKE, \ - .abilities = {ABILITY_PUNK_ROCK, ability2, ABILITY_TECHNICIAN},\ - .bodyColor = BODY_COLOR_PURPLE, \ - .noFlip = FALSE, \ - } - -#define SINISTEA_BASE_STATS \ - { \ - .baseHP = 40, \ - .baseAttack = 45, \ - .baseDefense = 45, \ - .baseSpeed = 50, \ - .baseSpAttack = 74, \ - .baseSpDefense = 54, \ - .type1 = TYPE_GHOST, \ - .type2 = TYPE_GHOST, \ - .catchRate = 120, \ - .expYield = 62, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_MINERAL, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY},\ - .bodyColor = BODY_COLOR_PURPLE, \ - .noFlip = FALSE, \ - } - -#define POLTEAGEIST_BASE_STATS \ - { \ - .baseHP = 60, \ - .baseAttack = 65, \ - .baseDefense = 65, \ - .baseSpeed = 70, \ - .baseSpAttack = 134, \ - .baseSpDefense = 114, \ - .type1 = TYPE_GHOST, \ - .type2 = TYPE_GHOST, \ - .catchRate = 60, \ - .expYield = 178, \ - .evYield_SpAttack = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_MINERAL, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY},\ - .bodyColor = BODY_COLOR_PURPLE, \ - .noFlip = FALSE, \ - } - -#define ALCREMIE_BASE_STATS(color) \ - { \ - .baseHP = 65, \ - .baseAttack = 60, \ - .baseDefense = 75, \ - .baseSpeed = 64, \ - .baseSpAttack = 110, \ - .baseSpDefense = 121, \ - .type1 = TYPE_FAIRY, \ - .type2 = TYPE_FAIRY, \ - .catchRate = 100, \ - .expYield = 173, \ - .evYield_SpDefense = 2, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FAIRY, \ - .eggGroup2 = EGG_GROUP_AMORPHOUS, \ - .abilities = {ABILITY_SWEET_VEIL, ABILITY_NONE, ABILITY_AROMA_VEIL},\ - .bodyColor = color, \ - .noFlip = FALSE, \ - } - -#define MORPEKO_BASE_STATS \ - { \ - .baseHP = 58, \ - .baseAttack = 95, \ - .baseDefense = 58, \ - .baseSpeed = 97, \ - .baseSpAttack = 70, \ - .baseSpDefense = 58, \ - .type1 = TYPE_ELECTRIC, \ - .type2 = TYPE_DARK, \ - .catchRate = 180, \ - .expYield = 153, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 10, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroup1 = EGG_GROUP_FIELD, \ - .eggGroup2 = EGG_GROUP_FAIRY, \ - .abilities = {ABILITY_HUNGER_SWITCH, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_YELLOW, \ - .noFlip = FALSE, \ - } - -#define ZARUDE_BASE_STATS \ - { \ - .baseHP = 105, \ - .baseAttack = 120, \ - .baseDefense = 105, \ - .baseSpeed = 105, \ - .baseSpAttack = 70, \ - .baseSpDefense = 95, \ - .type1 = TYPE_DARK, \ - .type2 = TYPE_GRASS, \ - .catchRate = 3, \ - .expYield = 300, \ - .evYield_Attack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ - .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ - .abilities = {ABILITY_LEAF_GUARD, ABILITY_NONE},\ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - .flags = FLAG_MYTHICAL, \ - } - const struct BaseStats gBaseStats[] = { [SPECIES_NONE] = {0}, @@ -986,6 +59,22 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, +#define VENUSAUR_MISC_STATS(ability1, ability3) \ + .type1 = TYPE_GRASS, \ + .type2 = TYPE_POISON, \ + .catchRate = 45, \ + .evYield_SpAttack = 2, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_MONSTER, \ + .eggGroup2 = EGG_GROUP_GRASS, \ + .abilities = {ability1, ABILITY_NONE, ability3}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE + [SPECIES_VENUSAUR] = { .baseHP = 80, @@ -994,21 +83,19 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 80, .baseSpAttack = 100, .baseSpDefense = 100, - .type1 = TYPE_GRASS, - .type2 = TYPE_POISON, - .catchRate = 45, .expYield = 236, - .evYield_SpAttack = 2, - .evYield_SpDefense = 1, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_MONSTER, - .eggGroup2 = EGG_GROUP_GRASS, - .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, + VENUSAUR_MISC_STATS(ABILITY_OVERGROW, ABILITY_CHLOROPHYLL), + }, + [SPECIES_VENUSAUR_MEGA] = + { + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 123, + .baseSpeed = 80, + .baseSpAttack = 122, + .baseSpDefense = 120, + .expYield = 281, + VENUSAUR_MISC_STATS(ABILITY_THICK_FAT, ABILITY_THICK_FAT), }, [SPECIES_CHARMANDER] = @@ -1412,6 +499,31 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, }, + [SPECIES_RATTATA_ALOLAN] = + { + .baseHP = 30, + .baseAttack = 56, + .baseDefense = 35, + .baseSpeed = 72, + .baseSpAttack = 25, + .baseSpDefense = 35, + .type1 = TYPE_DARK, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 51, + .evYield_Speed = 1, + .itemRare = ITEM_PECHA_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_GLUTTONY, ABILITY_HUSTLE, ABILITY_THICK_FAT}, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + .flags = FLAG_ALOLAN_FORM, + }, [SPECIES_RATICATE] = { @@ -1437,6 +549,32 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, + [SPECIES_RATICATE_ALOLAN] = + { + .baseHP = 75, + .baseAttack = 71, + .baseDefense = 70, + .baseSpeed = 77, + .baseSpAttack = 40, + .baseSpDefense = 80, + .type1 = TYPE_DARK, + .type2 = TYPE_NORMAL, + .catchRate = 127, + .expYield = 145, + .evYield_Speed = 2, + .itemRare = ITEM_PECHA_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_GLUTTONY, ABILITY_HUSTLE, ABILITY_THICK_FAT}, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + .flags = FLAG_ALOLAN_FORM, + }, + [SPECIES_SPEAROW] = { .baseHP = 40, @@ -1539,7 +677,53 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_PIKACHU] = PIKACHU_BASE_STATS(PERCENT_FEMALE(50), FLIP), +#if P_UPDATED_STATS >= GEN_6 + #define PIKACHU_BASE_DEFENSES\ + .baseDefense = 40, \ + .baseSpDefense = 50 +#else + #define PIKACHU_BASE_DEFENSES\ + .baseDefense = 30, \ + .baseSpDefense = 40 +#endif +#define PIKACHU_BASE_STATS(gender, flip) \ + { \ + .baseHP = 35, \ + .baseAttack = 55, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + PIKACHU_BASE_DEFENSES, \ + .type1 = TYPE_ELECTRIC, \ + .type2 = TYPE_ELECTRIC, \ + .catchRate = 190, \ + .expYield = 112, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .genderRatio = gender, \ + .eggCycles = 10, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FAIRY, \ + .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD},\ + .bodyColor = BODY_COLOR_YELLOW, \ + .noFlip = flip, \ + } + [SPECIES_PIKACHU] = PIKACHU_BASE_STATS(PERCENT_FEMALE(50), FLIP), + [SPECIES_PIKACHU_COSPLAY] = PIKACHU_BASE_STATS(MON_FEMALE, FLIP), + [SPECIES_PIKACHU_ROCK_STAR] = PIKACHU_BASE_STATS(MON_FEMALE, FLIP), + [SPECIES_PIKACHU_BELLE] = PIKACHU_BASE_STATS(MON_FEMALE, NO_FLIP), + [SPECIES_PIKACHU_POP_STAR] = PIKACHU_BASE_STATS(MON_FEMALE, NO_FLIP), + [SPECIES_PIKACHU_PH_D] = PIKACHU_BASE_STATS(MON_FEMALE, FLIP), + [SPECIES_PIKACHU_LIBRE] = PIKACHU_BASE_STATS(MON_FEMALE, FLIP), + [SPECIES_PIKACHU_ORIGINAL_CAP] = PIKACHU_BASE_STATS(MON_MALE, NO_FLIP), + [SPECIES_PIKACHU_HOENN_CAP] = PIKACHU_BASE_STATS(MON_MALE, FLIP), + [SPECIES_PIKACHU_SINNOH_CAP] = PIKACHU_BASE_STATS(MON_MALE, FLIP), + [SPECIES_PIKACHU_UNOVA_CAP] = PIKACHU_BASE_STATS(MON_MALE, FLIP), + [SPECIES_PIKACHU_KALOS_CAP] = PIKACHU_BASE_STATS(MON_MALE, FLIP), + [SPECIES_PIKACHU_ALOLA_CAP] = PIKACHU_BASE_STATS(MON_MALE, FLIP), + [SPECIES_PIKACHU_PARTNER_CAP] = PIKACHU_BASE_STATS(MON_MALE, NO_FLIP), + [SPECIES_PIKACHU_WORLD_CAP] = PIKACHU_BASE_STATS(MON_MALE, FLIP), [SPECIES_RAICHU] = { @@ -2786,30 +1970,33 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_GEODUDE] = - { - .baseHP = 40, - .baseAttack = 80, - .baseDefense = 100, - .baseSpeed = 20, - .baseSpAttack = 30, - .baseSpDefense = 30, - .type1 = TYPE_ROCK, - .type2 = TYPE_GROUND, - .catchRate = 255, - .expYield = 60, - .evYield_Defense = 1, - .itemRare = ITEM_EVERSTONE, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_MINERAL, - .eggGroup2 = EGG_GROUP_MINERAL, - .abilities = {ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL}, - .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, - }, +#define GEODUDE_BASE_STATS(type, item, ability1, ability3, flag) \ + { \ + .baseHP = 40, \ + .baseAttack = 80, \ + .baseDefense = 100, \ + .baseSpeed = 20, \ + .baseSpAttack = 30, \ + .baseSpDefense = 30, \ + .type1 = TYPE_ROCK, \ + .type2 = TYPE_##type, \ + .catchRate = 255, \ + .expYield = 60, \ + .evYield_Defense = 1, \ + .itemRare = ITEM_##item, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_MINERAL, \ + .eggGroup2 = EGG_GROUP_MINERAL, \ + .abilities = {ABILITY_##ability1, ABILITY_STURDY, ABILITY_##ability3}, \ + .bodyColor = BODY_COLOR_BROWN, \ + .noFlip = FALSE, \ + .flags = flag, \ + } + [SPECIES_GEODUDE] = GEODUDE_BASE_STATS(GROUND, EVERSTONE, ROCK_HEAD, SAND_VEIL, 0), + [SPECIES_GEODUDE_ALOLAN] = GEODUDE_BASE_STATS(ELECTRIC, CELL_BATTERY, MAGNET_PULL, GALVANIZE, FLAG_ALOLAN_FORM), [SPECIES_GRAVELER] = { @@ -5239,7 +4426,31 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_PICHU] = PICHU_BASE_STATS(FLIP), +#define PICHU_BASE_STATS(flip) \ + { \ + .baseHP = 20, \ + .baseAttack = 40, \ + .baseDefense = 15, \ + .baseSpeed = 60, \ + .baseSpAttack = 35, \ + .baseSpDefense = 35, \ + .type1 = TYPE_ELECTRIC, \ + .type2 = TYPE_ELECTRIC, \ + .catchRate = 190, \ + .expYield = 41, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 10, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD},\ + .bodyColor = BODY_COLOR_YELLOW, \ + .noFlip = flip, \ + } + [SPECIES_PICHU] = PICHU_BASE_STATS(FLIP), + [SPECIES_PICHU_SPIKY_EARED] = PICHU_BASE_STATS(NO_FLIP), [SPECIES_CLEFFA] = { @@ -5965,7 +5176,32 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_UNOWN] = UNOWN_BASE_STATS(FLIP), + +#define UNOWN_BASE_STATS(flip) \ + { \ + .baseHP = 48, \ + .baseAttack = 72, \ + .baseDefense = 48, \ + .baseSpeed = 48, \ + .baseSpAttack = 72, \ + .baseSpDefense = 48, \ + .type1 = TYPE_PSYCHIC, \ + .type2 = TYPE_PSYCHIC, \ + .catchRate = 225, \ + .expYield = 118, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 40, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_LEVITATE, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_BLACK, \ + .noFlip = flip, \ + } + [SPECIES_UNOWN] = UNOWN_BASE_STATS(FLIP), [SPECIES_UNOWN_B] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_C] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_D] = UNOWN_BASE_STATS(NO_FLIP), @@ -9802,10 +9038,35 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, +#define CASTFORM_BASE_STATS(type, color) \ + { \ + .baseHP = 70, \ + .baseAttack = 70, \ + .baseDefense = 70, \ + .baseSpeed = 70, \ + .baseSpAttack = 70, \ + .baseSpDefense = 70, \ + .type1 = type, \ + .type2 = type, \ + .catchRate = 45, \ + .expYield = 147, \ + .evYield_HP = 1, \ + .itemCommon = ITEM_MYSTIC_WATER, \ + .itemRare = ITEM_MYSTIC_WATER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_FORECAST, ABILITY_NONE},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } [SPECIES_CASTFORM_NORMAL] = CASTFORM_BASE_STATS(TYPE_NORMAL, BODY_COLOR_GRAY), - [SPECIES_CASTFORM_SUNNY] = CASTFORM_BASE_STATS(TYPE_FIRE, BODY_COLOR_RED), - [SPECIES_CASTFORM_RAINY] = CASTFORM_BASE_STATS(TYPE_WATER, BODY_COLOR_BLUE), - [SPECIES_CASTFORM_SNOWY] = CASTFORM_BASE_STATS(TYPE_ICE, BODY_COLOR_WHITE), + [SPECIES_CASTFORM_SUNNY] = CASTFORM_BASE_STATS(TYPE_FIRE, BODY_COLOR_RED), + [SPECIES_CASTFORM_RAINY] = CASTFORM_BASE_STATS(TYPE_WATER, BODY_COLOR_BLUE), + [SPECIES_CASTFORM_SNOWY] = CASTFORM_BASE_STATS(TYPE_ICE, BODY_COLOR_WHITE), [SPECIES_KECLEON] = { @@ -10766,7 +10027,6 @@ const struct BaseStats gBaseStats[] = }, #if P_GEN_4_POKEMON == TRUE -// Diamond and Pearl [SPECIES_TURTWIG] = { .baseHP = 55, @@ -11390,6 +10650,29 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, +#define BURMY_BASE_STATS(color) \ + { \ + .baseHP = 40, \ + .baseAttack = 29, \ + .baseDefense = 45, \ + .baseSpeed = 36, \ + .baseSpAttack = 29, \ + .baseSpDefense = 45, \ + .type1 = TYPE_BUG, \ + .type2 = TYPE_BUG, \ + .catchRate = 120, \ + .expYield = 45, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_BUG, \ + .eggGroup2 = EGG_GROUP_BUG, \ + .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } [SPECIES_BURMY_PLANT_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_GREEN), [SPECIES_BURMY_SANDY_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_BROWN), [SPECIES_BURMY_TRASH_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_RED), @@ -11645,13 +10928,83 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, +#define CHERRIM_BASE_STATS(color) \ + { \ + .baseHP = 70, \ + .baseAttack = 60, \ + .baseDefense = 70, \ + .baseSpeed = 85, \ + .baseSpAttack = 87, \ + .baseSpDefense = 78, \ + .type1 = TYPE_GRASS, \ + .type2 = TYPE_GRASS, \ + .catchRate = 75, \ + .expYield = 158, \ + .evYield_SpAttack = 2, \ + .itemRare = ITEM_MIRACLE_SEED, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_GRASS, \ + .abilities = {ABILITY_FLOWER_GIFT, ABILITY_NONE},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } [SPECIES_CHERRIM_OVERCAST] = CHERRIM_BASE_STATS(BODY_COLOR_PURPLE), [SPECIES_CHERRIM_SUNSHINE] = CHERRIM_BASE_STATS(BODY_COLOR_PINK), +#define SHELLOS_BASE_STATS(color) \ + { \ + .baseHP = 76, \ + .baseAttack = 48, \ + .baseDefense = 48, \ + .baseSpeed = 34, \ + .baseSpAttack = 57, \ + .baseSpDefense = 62, \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_WATER, \ + .catchRate = 190, \ + .expYield = 65, \ + .evYield_HP = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_WATER_1, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } [SPECIES_SHELLOS_WEST_SEA] = SHELLOS_BASE_STATS(BODY_COLOR_PURPLE), [SPECIES_SHELLOS_EAST_SEA] = SHELLOS_BASE_STATS(BODY_COLOR_BLUE), - [SPECIES_GASTRODON] = GASTRODON_BASE_STATS(BODY_COLOR_PURPLE), +#define GASTRODON_BASE_STATS(color) \ + { \ + .baseHP = 111, \ + .baseAttack = 83, \ + .baseDefense = 68, \ + .baseSpeed = 39, \ + .baseSpAttack = 92, \ + .baseSpDefense = 82, \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_GROUND, \ + .catchRate = 75, \ + .expYield = 166, \ + .evYield_HP = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_WATER_1, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } + [SPECIES_GASTRODON_WEST_SEA] = GASTRODON_BASE_STATS(BODY_COLOR_PURPLE), [SPECIES_GASTRODON_EAST_SEA] = GASTRODON_BASE_STATS(BODY_COLOR_BLUE), [SPECIES_AMBIPOM] = @@ -13020,6 +12373,33 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, +#define ROTOM_MISC_STATS(type, exp, flip) \ + .type1 = TYPE_ELECTRIC, \ + .type2 = type, \ + .catchRate = 45, \ + .expYield = exp, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_AMORPHOUS, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_LEVITATE, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = flip + +#define ROTOM_FORM_BASE_STATS(type, flip) \ + { \ + .baseHP = 50, \ + .baseAttack = 65, \ + .baseDefense = 107, \ + .baseSpeed = 86, \ + .baseSpAttack = 105, \ + .baseSpDefense = 107, \ + ROTOM_MISC_STATS(type, 182, flip), \ + } [SPECIES_ROTOM] = { .baseHP = 50, @@ -13028,22 +12408,13 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 91, .baseSpAttack = 95, .baseSpDefense = 77, - .type1 = TYPE_ELECTRIC, - .type2 = TYPE_GHOST, - .catchRate = 45, - .expYield = 154, - .evYield_Speed = 1, - .evYield_SpAttack = 1, - .genderRatio = MON_GENDERLESS, - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_AMORPHOUS, - .eggGroup2 = EGG_GROUP_AMORPHOUS, - .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, - .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, + ROTOM_MISC_STATS(TYPE_GHOST, 154, NO_FLIP), }, + [SPECIES_ROTOM_HEAT] = ROTOM_FORM_BASE_STATS(TYPE_FIRE, FLIP), + [SPECIES_ROTOM_WASH] = ROTOM_FORM_BASE_STATS(TYPE_WATER, NO_FLIP), + [SPECIES_ROTOM_FROST] = ROTOM_FORM_BASE_STATS(TYPE_ICE, FLIP), + [SPECIES_ROTOM_FAN] = ROTOM_FORM_BASE_STATS(TYPE_FLYING, FLIP), + [SPECIES_ROTOM_MOW] = ROTOM_FORM_BASE_STATS(TYPE_GRASS, FLIP), [SPECIES_UXIE] = { @@ -13124,6 +12495,23 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, +#define DIALGA_MISC_STATS \ + .type1 = TYPE_STEEL, \ + .type2 = TYPE_DRAGON, \ + .catchRate = 3, \ + .expYield = 306, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY + [SPECIES_DIALGA] = { .baseHP = 100, @@ -13132,23 +12520,37 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 90, .baseSpAttack = 150, .baseSpDefense = 100, - .type1 = TYPE_STEEL, - .type2 = TYPE_DRAGON, - .catchRate = 3, - .expYield = 306, - .evYield_SpAttack = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, + DIALGA_MISC_STATS, }, + [SPECIES_DIALGA_ORIGIN] = + { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 120, + .baseSpeed = 90, + .baseSpAttack = 150, + .baseSpDefense = 120, + DIALGA_MISC_STATS, + }, + +#define PALKIA_MISC_STATS \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_DRAGON, \ + .catchRate = 3, \ + .expYield = 306, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY + [SPECIES_PALKIA] = { .baseHP = 90, @@ -13157,21 +12559,18 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 100, .baseSpAttack = 150, .baseSpDefense = 120, - .type1 = TYPE_WATER, - .type2 = TYPE_DRAGON, - .catchRate = 3, - .expYield = 306, - .evYield_SpAttack = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, - .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, + PALKIA_MISC_STATS, + }, + + [SPECIES_PALKIA_ORIGIN] = + { + .baseHP = 90, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 120, + .baseSpAttack = 150, + .baseSpDefense = 120, + PALKIA_MISC_STATS, }, [SPECIES_HEATRAN] = @@ -13224,6 +12623,23 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, +#define GIRATINA_MISC_STATS(ability1, ability3) \ + .type1 = TYPE_GHOST, \ + .type2 = TYPE_DRAGON, \ + .catchRate = 3, \ + .expYield = 306, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ability1, ABILITY_NONE, ability3}, \ + .bodyColor = BODY_COLOR_BLACK, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY + [SPECIES_GIRATINA_ALTERED] = { .baseHP = 150, @@ -13232,21 +12648,17 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 90, .baseSpAttack = 100, .baseSpDefense = 120, - .type1 = TYPE_GHOST, - .type2 = TYPE_DRAGON, - .catchRate = 3, - .expYield = 306, - .evYield_HP = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, - .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, + GIRATINA_MISC_STATS(ABILITY_PRESSURE, ABILITY_TELEPATHY), + }, + [SPECIES_GIRATINA_ORIGIN] = + { + .baseHP = 150, + .baseAttack = 120, + .baseDefense = 100, + .baseSpeed = 90, + .baseSpAttack = 120, + .baseSpDefense = 100, + GIRATINA_MISC_STATS(ABILITY_LEVITATE, ABILITY_NONE), }, [SPECIES_CRESSELIA] = @@ -13377,6 +12789,30 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_MYTHICAL, }, +#define ARCEUS_BASE_STATS(type) \ + { \ + .baseHP = 120, \ + .baseAttack = 120, \ + .baseDefense = 120, \ + .baseSpeed = 120, \ + .baseSpAttack = 120, \ + .baseSpDefense = 120, \ + .type1 = type, \ + .type2 = type, \ + .catchRate = 3, \ + .expYield = 324, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_MULTITYPE, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ + .flags = FLAG_MYTHICAL, \ + } [SPECIES_ARCEUS_NORMAL] = ARCEUS_BASE_STATS(TYPE_NORMAL), [SPECIES_ARCEUS_FIGHTING] = ARCEUS_BASE_STATS(TYPE_FIGHTING), [SPECIES_ARCEUS_FLYING] = ARCEUS_BASE_STATS(TYPE_FLYING), @@ -13394,36 +12830,8 @@ const struct BaseStats gBaseStats[] = [SPECIES_ARCEUS_ICE] = ARCEUS_BASE_STATS(TYPE_ICE), [SPECIES_ARCEUS_DRAGON] = ARCEUS_BASE_STATS(TYPE_DRAGON), [SPECIES_ARCEUS_DARK] = ARCEUS_BASE_STATS(TYPE_DARK), -// Platinum - [SPECIES_ROTOM_HEAT] = ROTOM_FORM_BASE_STATS(TYPE_FIRE, FLIP), - [SPECIES_ROTOM_WASH] = ROTOM_FORM_BASE_STATS(TYPE_WATER, NO_FLIP), - [SPECIES_ROTOM_FROST] = ROTOM_FORM_BASE_STATS(TYPE_ICE, FLIP), - [SPECIES_ROTOM_FAN] = ROTOM_FORM_BASE_STATS(TYPE_FLYING, FLIP), - [SPECIES_ROTOM_MOW] = ROTOM_FORM_BASE_STATS(TYPE_GRASS, FLIP), + [SPECIES_ARCEUS_FAIRY] = ARCEUS_BASE_STATS(TYPE_FAIRY), - [SPECIES_GIRATINA_ORIGIN] = - { - .baseHP = 150, - .baseAttack = 120, - .baseDefense = 100, - .baseSpeed = 90, - .baseSpAttack = 120, - .baseSpDefense = 100, - .type1 = TYPE_GHOST, - .type2 = TYPE_DRAGON, - .catchRate = 3, - .expYield = 306, - .evYield_HP = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, - }, [SPECIES_SHAYMIN_SKY] = { @@ -13451,11 +12859,8 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, #endif -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = PICHU_BASE_STATS(NO_FLIP), #if P_GEN_5_POKEMON == TRUE -// Black and White [SPECIES_VICTINI] = { .baseHP = 100, @@ -14873,8 +14278,33 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, - [SPECIES_BASCULIN_RED_STRIPED] = BASCULIN_BASE_STATS(ITEM_DEEP_SEA_TOOTH, ABILITY_RECKLESS), - [SPECIES_BASCULIN_BLUE_STRIPED] = BASCULIN_BASE_STATS(ITEM_DEEP_SEA_SCALE, ABILITY_ROCK_HEAD), +#define BASCULIN_BASE_STATS(item, ability1) \ + { \ + .baseHP = 70, \ + .baseAttack = 92, \ + .baseDefense = 65, \ + .baseSpeed = 98, \ + .baseSpAttack = 80, \ + .baseSpDefense = 55, \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_WATER, \ + .catchRate = 25, \ + .expYield = 161, \ + .evYield_Speed = 2, \ + .itemRare = item, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_WATER_2, \ + .eggGroup2 = EGG_GROUP_WATER_2, \ + .abilities = {ability1, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER},\ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + } + [SPECIES_BASCULIN_RED_STRIPED] = BASCULIN_BASE_STATS(ITEM_DEEP_SEA_TOOTH, ABILITY_RECKLESS), + [SPECIES_BASCULIN_BLUE_STRIPED] = BASCULIN_BASE_STATS(ITEM_DEEP_SEA_SCALE, ABILITY_ROCK_HEAD), + [SPECIES_BASCULIN_WHITE_STRIPED] = BASCULIN_BASE_STATS(ITEM_DEEP_SEA_SCALE, ABILITY_RATTLED), [SPECIES_SANDILE] = { @@ -14978,8 +14408,32 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, }, + [SPECIES_DARUMAKA_GALARIAN] = + { + .baseHP = 70, + .baseAttack = 90, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 15, + .baseSpDefense = 45, + .type1 = TYPE_ICE, + .type2 = TYPE_ICE, + .catchRate = 120, + .expYield = 63, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS}, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + .flags = FLAG_GALARIAN_FORM, + }, - [SPECIES_DARMANITAN] = + [SPECIES_DARMANITAN_STANDARD_MODE] = { .baseHP = 105, .baseAttack = 140, @@ -15026,6 +14480,54 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, }, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = + { + .baseHP = 105, + .baseAttack = 140, + .baseDefense = 55, + .baseSpeed = 95, + .baseSpAttack = 30, + .baseSpDefense = 55, + .type1 = TYPE_ICE, + .type2 = TYPE_ICE, + .catchRate = 60, + .expYield = 168, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE}, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + .flags = FLAG_GALARIAN_FORM, + }, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = + { + .baseHP = 105, + .baseAttack = 160, + .baseDefense = 55, + .baseSpeed = 135, + .baseSpAttack = 30, + .baseSpDefense = 55, + .type1 = TYPE_ICE, + .type2 = TYPE_FIRE, + .catchRate = 60, + .expYield = 189, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE}, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + .flags = FLAG_GALARIAN_FORM, + }, [SPECIES_MARACTUS] = { @@ -15741,12 +15243,58 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_DEERLING] = DEERLING_BASE_STATS(BODY_COLOR_PINK), +#define DEERLING_BASE_STATS(color) \ + { \ + .baseHP = 60, \ + .baseAttack = 60, \ + .baseDefense = 50, \ + .baseSpeed = 75, \ + .baseSpAttack = 40, \ + .baseSpDefense = 50, \ + .type1 = TYPE_NORMAL, \ + .type2 = TYPE_GRASS, \ + .catchRate = 190, \ + .expYield = 67, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } + [SPECIES_DEERLING_SPRING] = DEERLING_BASE_STATS(BODY_COLOR_PINK), [SPECIES_DEERLING_SUMMER] = DEERLING_BASE_STATS(BODY_COLOR_GREEN), [SPECIES_DEERLING_AUTUMN] = DEERLING_BASE_STATS(BODY_COLOR_RED), [SPECIES_DEERLING_WINTER] = DEERLING_BASE_STATS(BODY_COLOR_BROWN), - [SPECIES_SAWSBUCK] = SAWSBUCK_BASE_STATS, +#define SAWSBUCK_BASE_STATS \ + { \ + .baseHP = 80, \ + .baseAttack = 100, \ + .baseDefense = 70, \ + .baseSpeed = 95, \ + .baseSpAttack = 60, \ + .baseSpDefense = 70, \ + .type1 = TYPE_NORMAL, \ + .type2 = TYPE_GRASS, \ + .catchRate = 75, \ + .expYield = 166, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE},\ + .bodyColor = BODY_COLOR_BROWN, \ + .noFlip = FALSE, \ + } + [SPECIES_SAWSBUCK_SPRING] = SAWSBUCK_BASE_STATS, [SPECIES_SAWSBUCK_SUMMER] = SAWSBUCK_BASE_STATS, [SPECIES_SAWSBUCK_AUTUMN] = SAWSBUCK_BASE_STATS, [SPECIES_SAWSBUCK_WINTER] = SAWSBUCK_BASE_STATS, @@ -17086,7 +16634,24 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_TORNADUS] = +#define TORNADUS_MISC_STATS(ability1, ability3) \ + .type1 = TYPE_FLYING, \ + .type2 = TYPE_FLYING, \ + .catchRate = 3, \ + .expYield = 261, \ + .evYield_Attack = 3, \ + .genderRatio = MON_MALE, \ + .eggCycles = 120, \ + .friendship = 90, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ability1, ABILITY_NONE, ability3}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY + + [SPECIES_TORNADUS_INCARNATE] = { .baseHP = 79, .baseAttack = 115, @@ -17094,24 +16659,36 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 111, .baseSpAttack = 125, .baseSpDefense = 80, - .type1 = TYPE_FLYING, - .type2 = TYPE_FLYING, - .catchRate = 3, - .expYield = 261, - .evYield_Attack = 3, - .genderRatio = MON_MALE, - .eggCycles = 120, - .friendship = 90, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRANKSTER, ABILITY_NONE, ABILITY_DEFIANT}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, + TORNADUS_MISC_STATS(ABILITY_PRANKSTER, ABILITY_DEFIANT), + }, + [SPECIES_TORNADUS_THERIAN] = + { + .baseHP = 79, + .baseAttack = 100, + .baseDefense = 80, + .baseSpeed = 121, + .baseSpAttack = 110, + .baseSpDefense = 90, + TORNADUS_MISC_STATS(ABILITY_REGENERATOR, ABILITY_NONE), }, - [SPECIES_THUNDURUS] = +#define THUNDURUS_MISC_STATS(ability1, ability3) \ + .type1 = TYPE_ELECTRIC, \ + .type2 = TYPE_FLYING, \ + .catchRate = 3, \ + .expYield = 261, \ + .genderRatio = MON_MALE, \ + .eggCycles = 120, \ + .friendship = 90, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ability1, ABILITY_NONE, ability3}, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY + + [SPECIES_THUNDURUS_INCARNATE] = { .baseHP = 79, .baseAttack = 115, @@ -17119,21 +16696,19 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 111, .baseSpAttack = 125, .baseSpDefense = 80, - .type1 = TYPE_ELECTRIC, - .type2 = TYPE_FLYING, - .catchRate = 3, - .expYield = 261, .evYield_Attack = 3, - .genderRatio = MON_MALE, - .eggCycles = 120, - .friendship = 90, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRANKSTER, ABILITY_NONE, ABILITY_DEFIANT}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, + THUNDURUS_MISC_STATS(ABILITY_PRANKSTER, ABILITY_DEFIANT), + }, + [SPECIES_THUNDURUS_THERIAN] = + { + .baseHP = 79, + .baseAttack = 105, + .baseDefense = 70, + .baseSpeed = 101, + .baseSpAttack = 145, + .baseSpDefense = 80, + .evYield_SpAttack = 3, + THUNDURUS_MISC_STATS(ABILITY_VOLT_ABSORB, ABILITY_NONE), }, [SPECIES_RESHIRAM] = @@ -17238,7 +16813,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_KELDEO] = + [SPECIES_KELDEO_ORDINARY] = { .baseHP = 91, .baseAttack = 72, @@ -17263,7 +16838,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_MYTHICAL, }, - [SPECIES_MELOETTA] = + [SPECIES_MELOETTA_ARIA] = { .baseHP = 100, .baseAttack = 77, @@ -17321,63 +16896,38 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_MYTHICAL, }, - [SPECIES_GENESECT] = GENESECT_BASE_STATS, +#define GENESECT_BASE_STATS \ + { \ + .baseHP = 71, \ + .baseAttack = 120, \ + .baseDefense = 95, \ + .baseSpeed = 99, \ + .baseSpAttack = 120, \ + .baseSpDefense = 95, \ + .type1 = TYPE_BUG, \ + .type2 = TYPE_STEEL, \ + .catchRate = 3, \ + .expYield = 270, \ + .evYield_Attack = 1, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_DOWNLOAD, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE, \ + .flags = FLAG_MYTHICAL, \ + } + [SPECIES_GENESECT] = GENESECT_BASE_STATS, [SPECIES_GENESECT_DOUSE_DRIVE] = GENESECT_BASE_STATS, [SPECIES_GENESECT_SHOCK_DRIVE] = GENESECT_BASE_STATS, - [SPECIES_GENESECT_BURN_DRIVE] = GENESECT_BASE_STATS, + [SPECIES_GENESECT_BURN_DRIVE] = GENESECT_BASE_STATS, [SPECIES_GENESECT_CHILL_DRIVE] = GENESECT_BASE_STATS, -// Black 2 and White 2 - [SPECIES_TORNADUS_THERIAN] = - { - .baseHP = 79, - .baseAttack = 100, - .baseDefense = 80, - .baseSpeed = 121, - .baseSpAttack = 110, - .baseSpDefense = 90, - .type1 = TYPE_FLYING, - .type2 = TYPE_FLYING, - .catchRate = 3, - .expYield = 261, - .evYield_Attack = 3, - .genderRatio = MON_MALE, - .eggCycles = 120, - .friendship = 90, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_REGENERATOR, ABILITY_NONE}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, - }, - - [SPECIES_THUNDURUS_THERIAN] = - { - .baseHP = 79, - .baseAttack = 105, - .baseDefense = 70, - .baseSpeed = 101, - .baseSpAttack = 145, - .baseSpDefense = 80, - .type1 = TYPE_ELECTRIC, - .type2 = TYPE_FLYING, - .catchRate = 3, - .expYield = 261, - .evYield_SpAttack = 3, - .genderRatio = MON_MALE, - .eggCycles = 120, - .friendship = 90, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_VOLT_ABSORB, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, - }, - [SPECIES_LANDORUS_THERIAN] = { .baseHP = 89, @@ -17672,28 +17222,49 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, +#define GRENINJA_BASE_FORM_ATTRIBUTES \ + .baseHP = 72, \ + .baseAttack = 95, \ + .baseDefense = 67, \ + .baseSpeed = 122, \ + .baseSpAttack = 103, \ + .baseSpDefense = 71 + +#define GRENINJA_MISC_STATS(gender, eggGroup, ability1, ability3) \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_DARK, \ + .catchRate = 45, \ + .expYield = 239, \ + .evYield_Speed = 3, \ + .genderRatio = gender, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = eggGroup, \ + .eggGroup2 = eggGroup, \ + .abilities = {ability1, ABILITY_NONE, ability3}, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = TRUE + [SPECIES_GRENINJA] = + { + GRENINJA_BASE_FORM_ATTRIBUTES, + GRENINJA_MISC_STATS(PERCENT_FEMALE(12.5), EGG_GROUP_WATER_1, ABILITY_TORRENT, ABILITY_PROTEAN), + }, + [SPECIES_GRENINJA_BATTLE_BOND] = + { + GRENINJA_BASE_FORM_ATTRIBUTES, + GRENINJA_MISC_STATS(MON_MALE, EGG_GROUP_UNDISCOVERED, ABILITY_BATTLE_BOND, ABILITY_NONE), + }, + [SPECIES_GRENINJA_ASH] = { .baseHP = 72, - .baseAttack = 95, + .baseAttack = 145, .baseDefense = 67, - .baseSpeed = 122, - .baseSpAttack = 103, + .baseSpeed = 132, + .baseSpAttack = 153, .baseSpDefense = 71, - .type1 = TYPE_WATER, - .type2 = TYPE_DARK, - .catchRate = 45, - .expYield = 239, - .evYield_Speed = 3, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_WATER_1, - .eggGroup2 = EGG_GROUP_WATER_1, - .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_PROTEAN}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = TRUE, + GRENINJA_MISC_STATS(MON_MALE, EGG_GROUP_UNDISCOVERED, ABILITY_BATTLE_BOND, ABILITY_NONE), }, [SPECIES_BUNNELBY] = @@ -17864,7 +17435,51 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_VIVILLON] = VIVILLON_BASE_STATS(BODY_COLOR_WHITE), +#define VIVILLON_BASE_STATS(color) \ + { \ + .baseHP = 80, \ + .baseAttack = 52, \ + .baseDefense = 50, \ + .baseSpeed = 89, \ + .baseSpAttack = 90, \ + .baseSpDefense = 50, \ + .type1 = TYPE_BUG, \ + .type2 = TYPE_FLYING, \ + .catchRate = 45, \ + .expYield = 185, \ + .evYield_HP = 1, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_BUG, \ + .eggGroup2 = EGG_GROUP_BUG, \ + .abilities = {ABILITY_SHIELD_DUST, ABILITY_COMPOUND_EYES, ABILITY_FRIEND_GUARD},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } + [SPECIES_VIVILLON_ICY_SNOW] = VIVILLON_BASE_STATS(BODY_COLOR_WHITE), + [SPECIES_VIVILLON_POLAR] = VIVILLON_BASE_STATS(BODY_COLOR_BLUE), + [SPECIES_VIVILLON_TUNDRA] = VIVILLON_BASE_STATS(BODY_COLOR_BLUE), + [SPECIES_VIVILLON_CONTINENTAL] = VIVILLON_BASE_STATS(BODY_COLOR_YELLOW), + [SPECIES_VIVILLON_GARDEN] = VIVILLON_BASE_STATS(BODY_COLOR_GREEN), + [SPECIES_VIVILLON_ELEGANT] = VIVILLON_BASE_STATS(BODY_COLOR_PURPLE), + [SPECIES_VIVILLON_MEADOW] = VIVILLON_BASE_STATS(BODY_COLOR_PINK), + [SPECIES_VIVILLON_MODERN] = VIVILLON_BASE_STATS(BODY_COLOR_RED), + [SPECIES_VIVILLON_MARINE] = VIVILLON_BASE_STATS(BODY_COLOR_BLUE), + [SPECIES_VIVILLON_ARCHIPELAGO] = VIVILLON_BASE_STATS(BODY_COLOR_BROWN), + [SPECIES_VIVILLON_HIGH_PLAINS] = VIVILLON_BASE_STATS(BODY_COLOR_BROWN), + [SPECIES_VIVILLON_SANDSTORM] = VIVILLON_BASE_STATS(BODY_COLOR_BROWN), + [SPECIES_VIVILLON_RIVER] = VIVILLON_BASE_STATS(BODY_COLOR_BROWN), + [SPECIES_VIVILLON_MONSOON] = VIVILLON_BASE_STATS(BODY_COLOR_GRAY), + [SPECIES_VIVILLON_SAVANNA] = VIVILLON_BASE_STATS(BODY_COLOR_GREEN), + [SPECIES_VIVILLON_SUN] = VIVILLON_BASE_STATS(BODY_COLOR_RED), + [SPECIES_VIVILLON_OCEAN] = VIVILLON_BASE_STATS(BODY_COLOR_RED), + [SPECIES_VIVILLON_JUNGLE] = VIVILLON_BASE_STATS(BODY_COLOR_GREEN), + [SPECIES_VIVILLON_FANCY] = VIVILLON_BASE_STATS(BODY_COLOR_PINK), + [SPECIES_VIVILLON_POKE_BALL] = VIVILLON_BASE_STATS(BODY_COLOR_RED), [SPECIES_LITLEO] = { @@ -17915,11 +17530,115 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_GENDER_DIFFERENCE, }, - [SPECIES_FLABEBE] = FLABEBE_BASE_STATS, +#define FLABEBE_BASE_STATS \ + { \ + .baseHP = 44, \ + .baseAttack = 38, \ + .baseDefense = 39, \ + .baseSpeed = 42, \ + .baseSpAttack = 61, \ + .baseSpDefense = 79, \ + .type1 = TYPE_FAIRY, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 225, \ + .expYield = 61, \ + .evYield_SpDefense = 1, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_FAIRY, \ + .abilities = {ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS},\ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ + } + [SPECIES_FLABEBE_RED_FLOWER] = FLABEBE_BASE_STATS, + [SPECIES_FLABEBE_YELLOW_FLOWER] = FLABEBE_BASE_STATS, + [SPECIES_FLABEBE_ORANGE_FLOWER] = FLABEBE_BASE_STATS, + [SPECIES_FLABEBE_BLUE_FLOWER] = FLABEBE_BASE_STATS, + [SPECIES_FLABEBE_WHITE_FLOWER] = FLABEBE_BASE_STATS, - [SPECIES_FLOETTE] = FLOETTE_BASE_STATS, +#define FLOETTE_BASE_STATS \ + { \ + .baseHP = 54, \ + .baseAttack = 45, \ + .baseDefense = 47, \ + .baseSpeed = 52, \ + .baseSpAttack = 75, \ + .baseSpDefense = 98, \ + .type1 = TYPE_FAIRY, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 120, \ + .expYield = 130, \ + .evYield_SpDefense = 2, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_FAIRY, \ + .abilities = {ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS},\ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ + } + [SPECIES_FLOETTE_RED_FLOWER] = FLOETTE_BASE_STATS, + [SPECIES_FLOETTE_YELLOW_FLOWER] = FLOETTE_BASE_STATS, + [SPECIES_FLOETTE_ORANGE_FLOWER] = FLOETTE_BASE_STATS, + [SPECIES_FLOETTE_BLUE_FLOWER] = FLOETTE_BASE_STATS, + [SPECIES_FLOETTE_WHITE_FLOWER] = FLOETTE_BASE_STATS, + [SPECIES_FLOETTE_ETERNAL_FLOWER] = + { + .baseHP = 74, + .baseAttack = 65, + .baseDefense = 67, + .baseSpeed = 92, + .baseSpAttack = 125, + .baseSpDefense = 128, + .type1 = TYPE_FAIRY, + .type2 = TYPE_FAIRY, + .catchRate = 120, + .expYield = 243, + .evYield_SpDefense = 2, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS}, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, - [SPECIES_FLORGES] = FLORGES_BASE_STATS, +#define FLORGES_BASE_STATS \ + { \ + .baseHP = 78, \ + .baseAttack = 65, \ + .baseDefense = 68, \ + .baseSpeed = 75, \ + .baseSpAttack = 112, \ + .baseSpDefense = 154, \ + .type1 = TYPE_FAIRY, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 45, \ + .expYield = 248, \ + .evYield_SpDefense = 3, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_FAIRY, \ + .abilities = {ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS},\ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ + } + [SPECIES_FLORGES_RED_FLOWER] = FLORGES_BASE_STATS, + [SPECIES_FLORGES_YELLOW_FLOWER] = FLORGES_BASE_STATS, + [SPECIES_FLORGES_ORANGE_FLOWER] = FLORGES_BASE_STATS, + [SPECIES_FLORGES_BLUE_FLOWER] = FLORGES_BASE_STATS, + [SPECIES_FLORGES_WHITE_FLOWER] = FLORGES_BASE_STATS, [SPECIES_SKIDDO] = { @@ -18019,7 +17738,39 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_FURFROU] = FURFROU_BASE_STATS(FLIP), +#define FURFROU_BASE_STATS(flip) \ + { \ + .baseHP = 75, \ + .baseAttack = 80, \ + .baseDefense = 60, \ + .baseSpeed = 102, \ + .baseSpAttack = 65, \ + .baseSpDefense = 90, \ + .type1 = TYPE_NORMAL, \ + .type2 = TYPE_NORMAL, \ + .catchRate = 160, \ + .expYield = 165, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ABILITY_FUR_COAT, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = flip, \ + } + [SPECIES_FURFROU_NATURAL] = FURFROU_BASE_STATS(FLIP), + [SPECIES_FURFROU_HEART_TRIM] = FURFROU_BASE_STATS(FLIP), + [SPECIES_FURFROU_STAR_TRIM] = FURFROU_BASE_STATS(FLIP), + [SPECIES_FURFROU_DIAMOND_TRIM] = FURFROU_BASE_STATS(FLIP), + [SPECIES_FURFROU_DEBUTANTE_TRIM] = FURFROU_BASE_STATS(NO_FLIP), + [SPECIES_FURFROU_MATRON_TRIM] = FURFROU_BASE_STATS(FLIP), + [SPECIES_FURFROU_DANDY_TRIM] = FURFROU_BASE_STATS(FLIP), + [SPECIES_FURFROU_LA_REINE_TRIM] = FURFROU_BASE_STATS(FLIP), + [SPECIES_FURFROU_KABUKI_TRIM] = FURFROU_BASE_STATS(FLIP), + [SPECIES_FURFROU_PHARAOH_TRIM] = FURFROU_BASE_STATS(FLIP), [SPECIES_ESPURR] = { @@ -18045,29 +17796,31 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEOWSTIC] = - { - .baseHP = 74, - .baseAttack = 48, - .baseDefense = 76, - .baseSpeed = 104, - .baseSpAttack = 83, - .baseSpDefense = 81, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_PSYCHIC, - .catchRate = 75, - .expYield = 163, - .evYield_Speed = 2, - .genderRatio = MON_MALE, - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_PRANKSTER}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - }, +#define MEOWSTIC_BASE_STATS(gender, ability3, color) \ + { \ + .baseHP = 74, \ + .baseAttack = 48, \ + .baseDefense = 76, \ + .baseSpeed = 104, \ + .baseSpAttack = 83, \ + .baseSpDefense = 81, \ + .type1 = TYPE_PSYCHIC, \ + .type2 = TYPE_PSYCHIC, \ + .catchRate = 75, \ + .expYield = 163, \ + .evYield_Speed = 2, \ + .genderRatio = gender, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ability3}, \ + .bodyColor = color, \ + .noFlip = FALSE, \ + } + [SPECIES_MEOWSTIC_MALE] = MEOWSTIC_BASE_STATS(MON_MALE, ABILITY_PRANKSTER, BODY_COLOR_BLUE), + [SPECIES_MEOWSTIC_FEMALE] = MEOWSTIC_BASE_STATS(MON_FEMALE, ABILITY_COMPETITIVE, BODY_COLOR_WHITE), [SPECIES_HONEDGE] = { @@ -18117,7 +17870,25 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_AEGISLASH] = + +#define AEGISLASH_MISC_STATS \ + .type1 = TYPE_STEEL, \ + .type2 = TYPE_GHOST, \ + .catchRate = 45, \ + .expYield = 234, \ + .evYield_Defense = 2, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_MINERAL, \ + .eggGroup2 = EGG_GROUP_MINERAL, \ + .abilities = {ABILITY_STANCE_CHANGE, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_BROWN, \ + .noFlip = FALSE + + [SPECIES_AEGISLASH_SHIELD] = { .baseHP = 60, .baseAttack = 50, @@ -18130,21 +17901,22 @@ const struct BaseStats gBaseStats[] = .baseDefense = 150, .baseSpDefense = 150, #endif - .type1 = TYPE_STEEL, - .type2 = TYPE_GHOST, - .catchRate = 45, - .expYield = 234, - .evYield_Defense = 2, - .evYield_SpDefense = 1, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_MINERAL, - .eggGroup2 = EGG_GROUP_MINERAL, - .abilities = {ABILITY_STANCE_CHANGE, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, + AEGISLASH_MISC_STATS, + }, + [SPECIES_AEGISLASH_BLADE] = + { + .baseHP = 60, + .baseDefense = 50, + .baseSpeed = 60, + #if P_UPDATED_STATS >= GEN_8 + .baseAttack = 140, + .baseSpAttack = 140, + #else + .baseAttack = 150, + .baseSpAttack = 150, + #endif + .baseSpDefense = 50, + AEGISLASH_MISC_STATS, }, [SPECIES_SPRITZEE] = @@ -18828,7 +18600,23 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_PUMPKABOO] = +#define PUMKPABOO_MISC_STATS \ + .type1 = TYPE_GHOST, \ + .type2 = TYPE_GRASS, \ + .catchRate = 120, \ + .expYield = 67, \ + .evYield_Defense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_AMORPHOUS, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA},\ + .bodyColor = BODY_COLOR_BROWN, \ + .noFlip = FALSE + + [SPECIES_PUMPKABOO_AVERAGE] = { .baseHP = 49, .baseAttack = 66, @@ -18839,7 +18627,58 @@ const struct BaseStats gBaseStats[] = PUMKPABOO_MISC_STATS, }, - [SPECIES_GOURGEIST] = + [SPECIES_PUMPKABOO_SMALL] = + { + .baseHP = 44, + .baseAttack = 66, + .baseDefense = 70, + .baseSpeed = 56, + .baseSpAttack = 44, + .baseSpDefense = 55, + PUMKPABOO_MISC_STATS, + }, + + [SPECIES_PUMPKABOO_LARGE] = + { + .baseHP = 54, + .baseAttack = 66, + .baseDefense = 70, + .baseSpeed = 46, + .baseSpAttack = 44, + .baseSpDefense = 55, + PUMKPABOO_MISC_STATS, + }, + + [SPECIES_PUMPKABOO_SUPER] = + { + .baseHP = 59, + .baseAttack = 66, + .baseDefense = 70, + .baseSpeed = 41, + .baseSpAttack = 44, + .baseSpDefense = 55, + .itemCommon = ITEM_MIRACLE_SEED, + .itemRare = ITEM_MIRACLE_SEED, + PUMKPABOO_MISC_STATS, + }, + +#define GOURGEIST_MISC_STATS \ + .type1 = TYPE_GHOST, \ + .type2 = TYPE_GRASS, \ + .catchRate = 60, \ + .expYield = 173, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_AMORPHOUS, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA},\ + .bodyColor = BODY_COLOR_BROWN, \ + .noFlip = FALSE + + [SPECIES_GOURGEIST_AVERAGE] = { .baseHP = 65, .baseAttack = 90, @@ -18849,6 +18688,38 @@ const struct BaseStats gBaseStats[] = .baseSpDefense = 75, GOURGEIST_MISC_STATS, }, + [SPECIES_GOURGEIST_SMALL] = + { + .baseHP = 55, + .baseAttack = 85, + .baseDefense = 122, + .baseSpeed = 99, + .baseSpAttack = 58, + .baseSpDefense = 75, + GOURGEIST_MISC_STATS, + }, + [SPECIES_GOURGEIST_LARGE] = + { + .baseHP = 75, + .baseAttack = 95, + .baseDefense = 122, + .baseSpeed = 69, + .baseSpAttack = 58, + .baseSpDefense = 75, + GOURGEIST_MISC_STATS, + }, + [SPECIES_GOURGEIST_SUPER] = + { + .baseHP = 85, + .baseAttack = 100, + .baseDefense = 122, + .baseSpeed = 54, + .baseSpAttack = 58, + .baseSpDefense = 75, + .itemCommon = ITEM_MIRACLE_SEED, + .itemRare = ITEM_MIRACLE_SEED, + GOURGEIST_MISC_STATS, + }, [SPECIES_BERGMITE] = { @@ -18962,7 +18833,32 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_XERNEAS] = XERNEAS_BASE_STATS, +#define XERNEAS_BASE_STATS \ + { \ + .baseHP = 126, \ + .baseAttack = 131, \ + .baseDefense = 95, \ + .baseSpeed = 99, \ + .baseSpAttack = 131, \ + .baseSpDefense = 98, \ + .type1 = TYPE_FAIRY, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 45, \ + .expYield = 306, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_FAIRY_AURA, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY, \ + } + [SPECIES_XERNEAS_NEUTRAL] = XERNEAS_BASE_STATS, + [SPECIES_XERNEAS_ACTIVE] = XERNEAS_BASE_STATS, [SPECIES_YVELTAL] = { @@ -18989,7 +18885,84 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_ZYGARDE] = ZYGARDE_50_BASE_STATS(ABILITY_AURA_BREAK), + +#define ZYGARDE_50_BASE_STATS(ability) \ + { \ + .baseHP = 108, \ + .baseAttack = 100, \ + .baseDefense = 121, \ + .baseSpeed = 95, \ + .baseSpAttack = 81, \ + .baseSpDefense = 95, \ + .type1 = TYPE_DRAGON, \ + .type2 = TYPE_GROUND, \ + .catchRate = 3, \ + .expYield = 270, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ability, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = TRUE, \ + .flags = FLAG_LEGENDARY, \ + } + +#define ZYGARDE_10_BASE_STATS(ability) \ + { \ + .baseHP = 54, \ + .baseAttack = 100, \ + .baseDefense = 71, \ + .baseSpeed = 115, \ + .baseSpAttack = 61, \ + .baseSpDefense = 85, \ + .type1 = TYPE_DRAGON, \ + .type2 = TYPE_GROUND, \ + .catchRate = 3, \ + .expYield = 219, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ability, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_BLACK, \ + .noFlip = TRUE, \ + .flags = FLAG_LEGENDARY, \ + } + [SPECIES_ZYGARDE_50] = ZYGARDE_50_BASE_STATS(ABILITY_AURA_BREAK), + [SPECIES_ZYGARDE_10] = ZYGARDE_10_BASE_STATS(ABILITY_AURA_BREAK), + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = ZYGARDE_10_BASE_STATS(ABILITY_POWER_CONSTRUCT), + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = ZYGARDE_50_BASE_STATS(ABILITY_POWER_CONSTRUCT), + [SPECIES_ZYGARDE_COMPLETE] = + { + .baseHP = 216, + .baseAttack = 100, + .baseDefense = 121, + .baseSpeed = 85, + .baseSpAttack = 91, + .baseSpDefense = 95, + .type1 = TYPE_DRAGON, + .type2 = TYPE_GROUND, + .catchRate = 3, + .expYield = 319, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_POWER_CONSTRUCT, ABILITY_NONE}, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = TRUE, + .flags = FLAG_LEGENDARY, + }, [SPECIES_DIANCIE] = { @@ -19017,7 +18990,33 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_MYTHICAL, }, - [SPECIES_HOOPA] = + [SPECIES_DIANCIE_MEGA] = + { + .baseHP = 50, + .baseAttack = 160, + .baseDefense = 110, + .baseSpeed = 110, + .baseSpAttack = 160, + .baseSpDefense = 110, + .type1 = TYPE_ROCK, + .type2 = TYPE_FAIRY, + .catchRate = 3, + .expYield = 315, + .evYield_Defense = 1, + .evYield_SpDefense = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE}, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + .flags = FLAG_MYTHICAL, + }, + + [SPECIES_HOOPA_CONFINED] = { .baseHP = 80, .baseAttack = 110, @@ -19042,6 +19041,31 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_MYTHICAL, }, + [SPECIES_HOOPA_UNBOUND] = + { + .baseHP = 80, + .baseAttack = 160, + .baseDefense = 60, + .baseSpeed = 80, + .baseSpAttack = 170, + .baseSpDefense = 130, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_DARK, + .catchRate = 3, + .expYield = 270, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_MAGICIAN, ABILITY_NONE}, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + .flags = FLAG_MYTHICAL, + }, + [SPECIES_VOLCANION] = { .baseHP = 80, @@ -19533,7 +19557,34 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ORICORIO] = ORICORIO_BASE_STATS(TYPE_FIRE, BODY_COLOR_RED), +#define ORICORIO_BASE_STATS(type, color) \ +{ \ + .baseHP = 75, \ + .baseAttack = 70, \ + .baseDefense = 70, \ + .baseSpeed = 93, \ + .baseSpAttack = 98, \ + .baseSpDefense = 70, \ + .type1 = type, \ + .type2 = TYPE_FLYING, \ + .catchRate = 45, \ + .expYield = 167, \ + .evYield_SpAttack = 2, \ + .itemRare = ITEM_HONEY, \ + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FLYING, \ + .eggGroup2 = EGG_GROUP_FLYING, \ + .abilities = {ABILITY_DANCER, ABILITY_NONE},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } + [SPECIES_ORICORIO_BAILE] = ORICORIO_BASE_STATS(TYPE_FIRE, BODY_COLOR_RED), + [SPECIES_ORICORIO_POM_POM] = ORICORIO_BASE_STATS(TYPE_ELECTRIC, BODY_COLOR_YELLOW), + [SPECIES_ORICORIO_PAU] = ORICORIO_BASE_STATS(TYPE_PSYCHIC, BODY_COLOR_PINK), + [SPECIES_ORICORIO_SENSU] = ORICORIO_BASE_STATS(TYPE_GHOST, BODY_COLOR_PURPLE), [SPECIES_CUTIEFLY] = { @@ -19585,9 +19636,33 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ROCKRUFF] = ROCKRUFF_BASE_STATS(ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_STEADFAST), +#define ROCKRUFF_BASE_STATS(ability1, ability2, hiddenAbility)\ + { \ + .baseHP = 45, \ + .baseAttack = 65, \ + .baseDefense = 40, \ + .baseSpeed = 60, \ + .baseSpAttack = 30, \ + .baseSpDefense = 40, \ + .type1 = TYPE_ROCK, \ + .type2 = TYPE_ROCK, \ + .catchRate = 190, \ + .expYield = 56, \ + .evYield_Attack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ability1, ability2, hiddenAbility}, \ + .bodyColor = BODY_COLOR_BROWN, \ + .noFlip = FALSE, \ + } + [SPECIES_ROCKRUFF] = ROCKRUFF_BASE_STATS(ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_STEADFAST), + [SPECIES_ROCKRUFF_OWN_TEMPO] = ROCKRUFF_BASE_STATS(ABILITY_OWN_TEMPO, ABILITY_NONE, ABILITY_NONE), - [SPECIES_LYCANROC] = + [SPECIES_LYCANROC_MIDDAY] = { .baseHP = 75, .baseAttack = 115, @@ -19610,8 +19685,55 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, }, + [SPECIES_LYCANROC_MIDNIGHT] = + { + .baseHP = 85, + .baseAttack = 115, + .baseDefense = 75, + .baseSpeed = 82, + .baseSpAttack = 55, + .baseSpDefense = 75, + .type1 = TYPE_ROCK, + .type2 = TYPE_ROCK, + .catchRate = 90, + .expYield = 170, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_NO_GUARD}, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, - [SPECIES_WISHIWASHI] = + [SPECIES_LYCANROC_DUSK] = + { + .baseHP = 75, + .baseAttack = 117, + .baseDefense = 65, + .baseSpeed = 110, + .baseSpAttack = 55, + .baseSpDefense = 65, + .type1 = TYPE_ROCK, + .type2 = TYPE_ROCK, + .catchRate = 90, + .expYield = 170, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_TOUGH_CLAWS, ABILITY_NONE}, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_WISHIWASHI_SOLO] = { .baseHP = 45, .baseAttack = 20, @@ -19635,6 +19757,30 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, + [SPECIES_WISHIWASHI_SCHOOL] = + { + .baseHP = 45, + .baseAttack = 140, + .baseDefense = 130, + .baseSpeed = 30, + .baseSpAttack = 140, + .baseSpDefense = 135, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 60, + .expYield = 61, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .abilities = {ABILITY_SCHOOLING, ABILITY_NONE}, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + [SPECIES_MAREANIE] = { .baseHP = 50, @@ -20280,9 +20426,104 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_SILVALLY] = SILVALLY_BASE_STATS(TYPE_NORMAL), +#define SILVALLY_BASE_STATS(type) \ + { \ + .baseHP = 95, \ + .baseAttack = 95, \ + .baseDefense = 95, \ + .baseSpeed = 95, \ + .baseSpAttack = 95, \ + .baseSpDefense = 95, \ + .type1 = type, \ + .type2 = type, \ + .catchRate = 3, \ + .expYield = 257, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_RKS_SYSTEM, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY, \ + } + [SPECIES_SILVALLY_NORMAL] = SILVALLY_BASE_STATS(TYPE_NORMAL), + [SPECIES_SILVALLY_FIGHTING] = SILVALLY_BASE_STATS(TYPE_FIGHTING), + [SPECIES_SILVALLY_FLYING] = SILVALLY_BASE_STATS(TYPE_FLYING), + [SPECIES_SILVALLY_POISON] = SILVALLY_BASE_STATS(TYPE_POISON), + [SPECIES_SILVALLY_GROUND] = SILVALLY_BASE_STATS(TYPE_GROUND), + [SPECIES_SILVALLY_ROCK] = SILVALLY_BASE_STATS(TYPE_ROCK), + [SPECIES_SILVALLY_BUG] = SILVALLY_BASE_STATS(TYPE_BUG), + [SPECIES_SILVALLY_GHOST] = SILVALLY_BASE_STATS(TYPE_GHOST), + [SPECIES_SILVALLY_STEEL] = SILVALLY_BASE_STATS(TYPE_STEEL), + [SPECIES_SILVALLY_FIRE] = SILVALLY_BASE_STATS(TYPE_FIRE), + [SPECIES_SILVALLY_WATER] = SILVALLY_BASE_STATS(TYPE_WATER), + [SPECIES_SILVALLY_GRASS] = SILVALLY_BASE_STATS(TYPE_GRASS), + [SPECIES_SILVALLY_ELECTRIC] = SILVALLY_BASE_STATS(TYPE_ELECTRIC), + [SPECIES_SILVALLY_PSYCHIC] = SILVALLY_BASE_STATS(TYPE_PSYCHIC), + [SPECIES_SILVALLY_ICE] = SILVALLY_BASE_STATS(TYPE_ICE), + [SPECIES_SILVALLY_DRAGON] = SILVALLY_BASE_STATS(TYPE_DRAGON), + [SPECIES_SILVALLY_DARK] = SILVALLY_BASE_STATS(TYPE_DARK), + [SPECIES_SILVALLY_FAIRY] = SILVALLY_BASE_STATS(TYPE_FAIRY), - [SPECIES_MINIOR] = MINIOR_METEOR_BASE_STATS, +#define MINIOR_METEOR_ATTRIBUTES\ + .baseHP = 60, \ + .baseAttack = 60, \ + .baseDefense = 100, \ + .baseSpeed = 60, \ + .baseSpAttack = 60, \ + .baseSpDefense = 100 +#define MINIOR_CORE_ATTRIBUTES\ + .baseHP = 60, \ + .baseAttack = 100, \ + .baseDefense = 60, \ + .baseSpeed = 120, \ + .baseSpAttack = 100, \ + .baseSpDefense = 60 +#define MINIOR_MISC_STATS(color) \ + .type1 = TYPE_ROCK, \ + .type2 = TYPE_FLYING, \ + .catchRate = 30, \ + .expYield = 154, \ + .evYield_Defense = 1, \ + .evYield_SpDefense = 1, \ + .itemRare = ITEM_STAR_PIECE, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 25, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_MINERAL, \ + .eggGroup2 = EGG_GROUP_MINERAL, \ + .abilities = {ABILITY_SHIELDS_DOWN, ABILITY_NONE},\ + .bodyColor = color, \ + .noFlip = TRUE +#define MINIOR_METEOR_BASE_STATS \ + { \ + MINIOR_METEOR_ATTRIBUTES, \ + MINIOR_MISC_STATS(BODY_COLOR_BROWN),\ + } +#define MINIOR_CORE_BASE_STATS(color)\ + { \ + MINIOR_CORE_ATTRIBUTES, \ + MINIOR_MISC_STATS(color), \ + } + [SPECIES_MINIOR_METEOR_RED] = MINIOR_METEOR_BASE_STATS, + [SPECIES_MINIOR_METEOR_ORANGE] = MINIOR_METEOR_BASE_STATS, + [SPECIES_MINIOR_METEOR_YELLOW] = MINIOR_METEOR_BASE_STATS, + [SPECIES_MINIOR_METEOR_GREEN] = MINIOR_METEOR_BASE_STATS, + [SPECIES_MINIOR_METEOR_BLUE] = MINIOR_METEOR_BASE_STATS, + [SPECIES_MINIOR_METEOR_INDIGO] = MINIOR_METEOR_BASE_STATS, + [SPECIES_MINIOR_METEOR_VIOLET] = MINIOR_METEOR_BASE_STATS, + [SPECIES_MINIOR_CORE_RED] = MINIOR_CORE_BASE_STATS(BODY_COLOR_RED), + [SPECIES_MINIOR_CORE_ORANGE] = MINIOR_CORE_BASE_STATS(BODY_COLOR_RED), + [SPECIES_MINIOR_CORE_YELLOW] = MINIOR_CORE_BASE_STATS(BODY_COLOR_YELLOW), + [SPECIES_MINIOR_CORE_GREEN] = MINIOR_CORE_BASE_STATS(BODY_COLOR_GREEN), + [SPECIES_MINIOR_CORE_BLUE] = MINIOR_CORE_BASE_STATS(BODY_COLOR_BLUE), + [SPECIES_MINIOR_CORE_INDIGO] = MINIOR_CORE_BASE_STATS(BODY_COLOR_BLUE), + [SPECIES_MINIOR_CORE_VIOLET] = MINIOR_CORE_BASE_STATS(BODY_COLOR_PURPLE), [SPECIES_KOMALA] = { @@ -20358,7 +20599,32 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MIMIKYU] = MIMIKYU_BASE_STATS, +#define MIMIKYU_BASE_STATS \ + { \ + .baseHP = 55, \ + .baseAttack = 90, \ + .baseDefense = 80, \ + .baseSpeed = 96, \ + .baseSpAttack = 50, \ + .baseSpDefense = 105, \ + .type1 = TYPE_GHOST, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 45, \ + .expYield = 167, \ + .evYield_SpDefense = 2, \ + .itemRare = ITEM_CHESTO_BERRY, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_AMORPHOUS, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_DISGUISE, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_YELLOW, \ + .noFlip = FALSE, \ + } + [SPECIES_MIMIKYU_DISGUISED] = MIMIKYU_BASE_STATS, + [SPECIES_MIMIKYU_BUSTED] = MIMIKYU_BASE_STATS, [SPECIES_BRUXISH] = { @@ -20914,7 +21180,109 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_MAGEARNA] = MAGEARNA_BASE_STATS(BODY_COLOR_GRAY), + [SPECIES_NECROZMA_DUSK_MANE] = + { + .baseHP = 97, + .baseAttack = 157, + .baseDefense = 127, + .baseSpeed = 77, + .baseSpAttack = 113, + .baseSpDefense = 109, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_STEEL, + .catchRate = 255, + .expYield = 306, + .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_PRISM_ARMOR, ABILITY_NONE}, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, + .flags = FLAG_LEGENDARY, + }, + + [SPECIES_NECROZMA_DAWN_WINGS] = + { + .baseHP = 97, + .baseAttack = 113, + .baseDefense = 109, + .baseSpeed = 77, + .baseSpAttack = 157, + .baseSpDefense = 127, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_GHOST, + .catchRate = 255, + .expYield = 306, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_PRISM_ARMOR, ABILITY_NONE}, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + .flags = FLAG_LEGENDARY, + }, + + [SPECIES_NECROZMA_ULTRA] = + { + .baseHP = 97, + .baseAttack = 167, + .baseDefense = 97, + .baseSpeed = 129, + .baseSpAttack = 167, + .baseSpDefense = 97, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_DRAGON, + .catchRate = 255, + .expYield = 339, + .evYield_Attack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_NEUROFORCE, ABILITY_NONE}, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, + .flags = FLAG_LEGENDARY, + }, + +#define MAGEARNA_BASE_STATS(color) \ + { \ + .baseHP = 80, \ + .baseAttack = 95, \ + .baseDefense = 115, \ + .baseSpeed = 65, \ + .baseSpAttack = 130, \ + .baseSpDefense = 115, \ + .type1 = TYPE_STEEL, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 3, \ + .expYield = 270, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_SOUL_HEART, ABILITY_NONE},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + .flags = FLAG_MYTHICAL, \ + } + [SPECIES_MAGEARNA] = MAGEARNA_BASE_STATS(BODY_COLOR_GRAY), + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = MAGEARNA_BASE_STATS(BODY_COLOR_RED), [SPECIES_MARSHADOW] = { @@ -21964,7 +22332,32 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_CRAMORANT] = CRAMORANT_BASE_STATS, +#define CRAMORANT_BASE_STATS \ + { \ + .baseHP = 70, \ + .baseAttack = 85, \ + .baseDefense = 55, \ + .baseSpeed = 85, \ + .baseSpAttack = 85, \ + .baseSpDefense = 95, \ + .type1 = TYPE_FLYING, \ + .type2 = TYPE_WATER, \ + .catchRate = 45, \ + .expYield = 166, \ + .evYield_SpDefense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_WATER_1, \ + .eggGroup2 = EGG_GROUP_FLYING, \ + .abilities = {ABILITY_GULP_MISSILE, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE, \ + } + [SPECIES_CRAMORANT] = CRAMORANT_BASE_STATS, + [SPECIES_CRAMORANT_GULPING] = CRAMORANT_BASE_STATS, + [SPECIES_CRAMORANT_GORGING] = CRAMORANT_BASE_STATS, [SPECIES_ARROKUDA] = { @@ -22038,7 +22431,31 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_TOXTRICITY] = TOXTRICITY_BASE_STATS(ABILITY_PLUS), +#define TOXTRICITY_BASE_STATS(ability2) \ + { \ + .baseHP = 75, \ + .baseAttack = 98, \ + .baseDefense = 70, \ + .baseSpeed = 75, \ + .baseSpAttack = 114, \ + .baseSpDefense = 70, \ + .type1 = TYPE_ELECTRIC, \ + .type2 = TYPE_POISON, \ + .catchRate = 45, \ + .expYield = 176, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, \ + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, \ + .abilities = {ABILITY_PUNK_ROCK, ability2, ABILITY_TECHNICIAN},\ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE, \ + } + [SPECIES_TOXTRICITY_AMPED] = TOXTRICITY_BASE_STATS(ABILITY_PLUS), + [SPECIES_TOXTRICITY_LOW_KEY] = TOXTRICITY_BASE_STATS(ABILITY_MINUS), [SPECIES_SIZZLIPEDE] = { @@ -22136,9 +22553,57 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_SINISTEA] = SINISTEA_BASE_STATS, +#define SINISTEA_BASE_STATS \ + { \ + .baseHP = 40, \ + .baseAttack = 45, \ + .baseDefense = 45, \ + .baseSpeed = 50, \ + .baseSpAttack = 74, \ + .baseSpDefense = 54, \ + .type1 = TYPE_GHOST, \ + .type2 = TYPE_GHOST, \ + .catchRate = 120, \ + .expYield = 62, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_MINERAL, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY},\ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE, \ + } + [SPECIES_SINISTEA_PHONY] = SINISTEA_BASE_STATS, + [SPECIES_SINISTEA_ANTIQUE] = SINISTEA_BASE_STATS, - [SPECIES_POLTEAGEIST] = POLTEAGEIST_BASE_STATS, +#define POLTEAGEIST_BASE_STATS \ + { \ + .baseHP = 60, \ + .baseAttack = 65, \ + .baseDefense = 65, \ + .baseSpeed = 70, \ + .baseSpAttack = 134, \ + .baseSpDefense = 114, \ + .type1 = TYPE_GHOST, \ + .type2 = TYPE_GHOST, \ + .catchRate = 60, \ + .expYield = 178, \ + .evYield_SpAttack = 2, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_MINERAL, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY},\ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE, \ + } + [SPECIES_POLTEAGEIST_PHONY] = POLTEAGEIST_BASE_STATS, + [SPECIES_POLTEAGEIST_ANTIQUE] = POLTEAGEIST_BASE_STATS, [SPECIES_HATENNA] = { @@ -22453,7 +22918,38 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALCREMIE] = ALCREMIE_BASE_STATS(BODY_COLOR_WHITE), +#define ALCREMIE_BASE_STATS(color) \ + { \ + .baseHP = 65, \ + .baseAttack = 60, \ + .baseDefense = 75, \ + .baseSpeed = 64, \ + .baseSpAttack = 110, \ + .baseSpDefense = 121, \ + .type1 = TYPE_FAIRY, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 100, \ + .expYield = 173, \ + .evYield_SpDefense = 2, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + .abilities = {ABILITY_SWEET_VEIL, ABILITY_NONE, ABILITY_AROMA_VEIL},\ + .bodyColor = color, \ + .noFlip = FALSE, \ + } + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_WHITE), + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_PINK), + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_GREEN), + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_BLUE), + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_YELLOW), + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_WHITE), + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_YELLOW), + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_BROWN), + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_YELLOW), [SPECIES_FALINKS] = { @@ -22577,7 +23073,23 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_EISCUE] = +#define EISCUE_MISC_STATS \ + .type1 = TYPE_ICE, \ + .type2 = TYPE_ICE, \ + .catchRate = 60, \ + .expYield = 165, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = 70, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_WATER_1, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ABILITY_ICE_FACE, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE + + [SPECIES_EISCUE_ICE_FACE] = { .baseHP = 75, .baseAttack = 80, @@ -22585,23 +23097,35 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 50, .baseSpAttack = 65, .baseSpDefense = 90, - .type1 = TYPE_ICE, - .type2 = TYPE_ICE, - .catchRate = 60, - .expYield = 165, - .evYield_Defense = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 25, - .friendship = 70, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_WATER_1, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_ICE_FACE, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, + EISCUE_MISC_STATS, + }, + [SPECIES_EISCUE_NOICE_FACE] = + { + .baseHP = 75, + .baseAttack = 80, + .baseDefense = 70, + .baseSpeed = 130, + .baseSpAttack = 65, + .baseSpDefense = 50, + EISCUE_MISC_STATS, }, - [SPECIES_INDEEDEE] = +#define INDEEDEE_MISC_STATS(ability1, gender) \ + .type1 = TYPE_PSYCHIC, \ + .type2 = TYPE_NORMAL, \ + .catchRate = 30, \ + .expYield = 166, \ + .genderRatio = MON_MALE, \ + .eggCycles = 40, \ + .friendship = 140, \ + .growthRate = GROWTH_FAST, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_FAIRY, \ + .abilities = {ability1, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE},\ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE + + [SPECIES_INDEEDEE_MALE] = { .baseHP = 60, .baseAttack = 65, @@ -22609,23 +23133,46 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 95, .baseSpAttack = 105, .baseSpDefense = 95, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_NORMAL, - .catchRate = 30, - .expYield = 166, .evYield_SpAttack = 2, - .genderRatio = MON_MALE, - .eggCycles = 40, - .friendship = 140, - .growthRate = GROWTH_FAST, - .eggGroup1 = EGG_GROUP_FAIRY, - .eggGroup2 = EGG_GROUP_FAIRY, - .abilities = {ABILITY_INNER_FOCUS, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE}, - .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, + INDEEDEE_MISC_STATS(ABILITY_INNER_FOCUS, MON_MALE), + }, + [SPECIES_INDEEDEE_FEMALE] = + { + .baseHP = 70, + .baseAttack = 55, + .baseDefense = 65, + .baseSpeed = 85, + .baseSpAttack = 95, + .baseSpDefense = 105, + .evYield_SpDefense = 2, + INDEEDEE_MISC_STATS(ABILITY_OWN_TEMPO, MON_FEMALE), }, - [SPECIES_MORPEKO] = MORPEKO_BASE_STATS, +#define MORPEKO_BASE_STATS \ + { \ + .baseHP = 58, \ + .baseAttack = 95, \ + .baseDefense = 58, \ + .baseSpeed = 97, \ + .baseSpAttack = 70, \ + .baseSpDefense = 58, \ + .type1 = TYPE_ELECTRIC, \ + .type2 = TYPE_DARK, \ + .catchRate = 180, \ + .expYield = 153, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 10, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FAIRY, \ + .abilities = {ABILITY_HUNGER_SWITCH, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_YELLOW, \ + .noFlip = FALSE, \ + } + [SPECIES_MORPEKO_FULL_BELLY] = MORPEKO_BASE_STATS, + [SPECIES_MORPEKO_HANGRY] = MORPEKO_BASE_STATS, [SPECIES_CUFANT] = { @@ -22869,7 +23416,24 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ZACIAN] = +#define ZACIAN_MISC_STATS(type, exp) \ + .type1 = TYPE_FAIRY, \ + .type2 = type, \ + .catchRate = 10, \ + .expYield = exp, \ + .evYield_Speed = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_INTREPID_SWORD, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY + + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = { .baseHP = 92, .baseAttack = 130, @@ -22877,24 +23441,37 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 138, .baseSpAttack = 80, .baseSpDefense = 115, - .type1 = TYPE_FAIRY, - .type2 = TYPE_FAIRY, - .catchRate = 10, - .expYield = 335, - .evYield_Speed = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_INTREPID_SWORD, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, + ZACIAN_MISC_STATS(TYPE_FAIRY, 335), + }, + [SPECIES_ZACIAN_CROWNED_SWORD] = + { + .baseHP = 92, + .baseAttack = 170, + .baseDefense = 115, + .baseSpeed = 148, + .baseSpAttack = 80, + .baseSpDefense = 115, + ZACIAN_MISC_STATS(TYPE_STEEL, 360), }, - [SPECIES_ZAMAZENTA] = +#define ZAMAZENTA_MISC_STATS(type, exp) \ + .type1 = TYPE_FIGHTING, \ + .type2 = type, \ + .catchRate = 10, \ + .expYield = exp, \ + .evYield_Speed = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = FALSE, \ + .flags = FLAG_LEGENDARY + + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = { .baseHP = 92, .baseAttack = 130, @@ -22902,21 +23479,17 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 138, .baseSpAttack = 80, .baseSpDefense = 115, - .type1 = TYPE_FIGHTING, - .type2 = TYPE_FIGHTING, - .catchRate = 10, - .expYield = 335, - .evYield_Speed = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE}, - .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, + ZAMAZENTA_MISC_STATS(TYPE_FIGHTING, 335), + }, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = + { + .baseHP = 92, + .baseAttack = 130, + .baseDefense = 145, + .baseSpeed = 128, + .baseSpAttack = 80, + .baseSpDefense = 145, + ZAMAZENTA_MISC_STATS(TYPE_STEEL, 360), }, [SPECIES_ETERNATUS] = @@ -22994,7 +23567,32 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_ZARUDE] = ZARUDE_BASE_STATS, +#define ZARUDE_BASE_STATS \ + { \ + .baseHP = 105, \ + .baseAttack = 120, \ + .baseDefense = 105, \ + .baseSpeed = 105, \ + .baseSpAttack = 70, \ + .baseSpDefense = 95, \ + .type1 = TYPE_DARK, \ + .type2 = TYPE_GRASS, \ + .catchRate = 3, \ + .expYield = 300, \ + .evYield_Attack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_LEAF_GUARD, ABILITY_NONE},\ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + .flags = FLAG_MYTHICAL, \ + } + [SPECIES_ZARUDE] = ZARUDE_BASE_STATS, + [SPECIES_ZARUDE_DADA] = ZARUDE_BASE_STATS, [SPECIES_REGIELEKI] = { @@ -23293,31 +23891,6 @@ const struct BaseStats gBaseStats[] = }, #endif - [SPECIES_VENUSAUR_MEGA] = - { - .baseHP = 80, - .baseAttack = 100, - .baseDefense = 123, - .baseSpeed = 80, - .baseSpAttack = 122, - .baseSpDefense = 120, - .type1 = TYPE_GRASS, - .type2 = TYPE_POISON, - .catchRate = 45, - .expYield = 281, - .evYield_SpAttack = 2, - .evYield_SpDefense = 1, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_MONSTER, - .eggGroup2 = EGG_GROUP_GRASS, - .abilities = {ABILITY_THICK_FAT, ABILITY_THICK_FAT}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - }, - [SPECIES_CHARIZARD_MEGA_X] = { .baseHP = 78, @@ -24428,34 +25001,6 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA] = - { - .baseHP = 50, - .baseAttack = 160, - .baseDefense = 110, - .baseSpeed = 110, - .baseSpAttack = 160, - .baseSpDefense = 110, - .type1 = TYPE_ROCK, - .type2 = TYPE_FAIRY, - .catchRate = 3, - .expYield = 315, - .evYield_Defense = 1, - .evYield_SpDefense = 2, - .genderRatio = MON_GENDERLESS, - .eggCycles = 25, - .friendship = 70, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE}, - .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, - .flags = FLAG_MYTHICAL, - }, -#endif - [SPECIES_RAYQUAZA_MEGA] = { .baseHP = 105, @@ -24532,57 +25077,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_RATTATA_ALOLAN] = - { - .baseHP = 30, - .baseAttack = 56, - .baseDefense = 35, - .baseSpeed = 72, - .baseSpAttack = 25, - .baseSpDefense = 35, - .type1 = TYPE_DARK, - .type2 = TYPE_NORMAL, - .catchRate = 255, - .expYield = 51, - .evYield_Speed = 1, - .itemRare = ITEM_PECHA_BERRY, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_GLUTTONY, ABILITY_HUSTLE, ABILITY_THICK_FAT}, - .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, - .flags = FLAG_ALOLAN_FORM, - }, - [SPECIES_RATICATE_ALOLAN] = - { - .baseHP = 75, - .baseAttack = 71, - .baseDefense = 70, - .baseSpeed = 77, - .baseSpAttack = 40, - .baseSpDefense = 80, - .type1 = TYPE_DARK, - .type2 = TYPE_NORMAL, - .catchRate = 127, - .expYield = 145, - .evYield_Speed = 2, - .itemRare = ITEM_PECHA_BERRY, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_GLUTTONY, ABILITY_HUSTLE, ABILITY_THICK_FAT}, - .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, - .flags = FLAG_ALOLAN_FORM, - }, [SPECIES_RAICHU_ALOLAN] = { @@ -24816,32 +25311,6 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_ALOLAN_FORM, }, - [SPECIES_GEODUDE_ALOLAN] = - { - .baseHP = 40, - .baseAttack = 80, - .baseDefense = 100, - .baseSpeed = 20, - .baseSpAttack = 30, - .baseSpDefense = 30, - .type1 = TYPE_ROCK, - .type2 = TYPE_ELECTRIC, - .catchRate = 255, - .expYield = 60, - .evYield_Defense = 1, - .itemRare = ITEM_CELL_BATTERY, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_MINERAL, - .eggGroup2 = EGG_GROUP_MINERAL, - .abilities = {ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE}, - .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, - .flags = FLAG_ALOLAN_FORM, - }, - [SPECIES_GRAVELER_ALOLAN] = { .baseHP = 55, @@ -25373,55 +25842,6 @@ const struct BaseStats gBaseStats[] = }, #if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN] = - { - .baseHP = 70, - .baseAttack = 90, - .baseDefense = 45, - .baseSpeed = 50, - .baseSpAttack = 15, - .baseSpDefense = 45, - .type1 = TYPE_ICE, - .type2 = TYPE_ICE, - .catchRate = 120, - .expYield = 63, - .evYield_Attack = 1, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - .flags = FLAG_GALARIAN_FORM, - }, - - [SPECIES_DARMANITAN_GALARIAN] = - { - .baseHP = 105, - .baseAttack = 140, - .baseDefense = 55, - .baseSpeed = 95, - .baseSpAttack = 30, - .baseSpDefense = 55, - .type1 = TYPE_ICE, - .type2 = TYPE_ICE, - .catchRate = 60, - .expYield = 168, - .evYield_Attack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - .flags = FLAG_GALARIAN_FORM, - }, [SPECIES_YAMASK_GALARIAN] = { @@ -25884,717 +26304,7 @@ const struct BaseStats gBaseStats[] = }, #endif - [SPECIES_PIKACHU_COSPLAY] = COSPLAY_PIKACHU_BASE_STATS(FLIP), - [SPECIES_PIKACHU_ROCK_STAR] = COSPLAY_PIKACHU_BASE_STATS(FLIP), - [SPECIES_PIKACHU_BELLE] = COSPLAY_PIKACHU_BASE_STATS(NO_FLIP), - [SPECIES_PIKACHU_POP_STAR] = COSPLAY_PIKACHU_BASE_STATS(NO_FLIP), - [SPECIES_PIKACHU_PH_D] = COSPLAY_PIKACHU_BASE_STATS(FLIP), - [SPECIES_PIKACHU_LIBRE] = COSPLAY_PIKACHU_BASE_STATS(FLIP), - - [SPECIES_PIKACHU_ORIGINAL_CAP] = CAP_PIKACHU_BASE_STATS(NO_FLIP), - [SPECIES_PIKACHU_HOENN_CAP] = CAP_PIKACHU_BASE_STATS(FLIP), - [SPECIES_PIKACHU_SINNOH_CAP] = CAP_PIKACHU_BASE_STATS(FLIP), - [SPECIES_PIKACHU_UNOVA_CAP] = CAP_PIKACHU_BASE_STATS(FLIP), - [SPECIES_PIKACHU_KALOS_CAP] = CAP_PIKACHU_BASE_STATS(FLIP), - [SPECIES_PIKACHU_ALOLA_CAP] = CAP_PIKACHU_BASE_STATS(FLIP), - [SPECIES_PIKACHU_PARTNER_CAP] = CAP_PIKACHU_BASE_STATS(NO_FLIP), - [SPECIES_PIKACHU_WORLD_CAP] = CAP_PIKACHU_BASE_STATS(FLIP), - -#if P_GEN_4_POKEMON == TRUE - - [SPECIES_DIALGA_ORIGIN] = - { - .baseHP = 100, - .baseAttack = 100, - .baseDefense = 120, - .baseSpeed = 90, - .baseSpAttack = 150, - .baseSpDefense = 120, - .type1 = TYPE_STEEL, - .type2 = TYPE_DRAGON, - .catchRate = 3, - .expYield = 306, - .evYield_SpAttack = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, - }, - - [SPECIES_PALKIA_ORIGIN] = - { - .baseHP = 90, - .baseAttack = 100, - .baseDefense = 100, - .baseSpeed = 120, - .baseSpAttack = 150, - .baseSpDefense = 120, - .type1 = TYPE_WATER, - .type2 = TYPE_DRAGON, - .catchRate = 3, - .expYield = 306, - .evYield_SpAttack = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, - .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, - }, - - [SPECIES_ARCEUS_FAIRY] = ARCEUS_BASE_STATS(TYPE_FAIRY), -#endif - -#if P_GEN_5_POKEMON == TRUE - [SPECIES_BASCULIN_WHITE_STRIPED] = BASCULIN_BASE_STATS(ITEM_DEEP_SEA_SCALE, ABILITY_RATTLED), - - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = - { - .baseHP = 105, - .baseAttack = 160, - .baseDefense = 55, - .baseSpeed = 135, - .baseSpAttack = 30, - .baseSpDefense = 55, - .type1 = TYPE_ICE, - .type2 = TYPE_FIRE, - .catchRate = 60, - .expYield = 189, - .evYield_SpAttack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - .flags = FLAG_GALARIAN_FORM, - }, -#endif - -#if P_GEN_6_POKEMON == TRUE - [SPECIES_GRENINJA_BATTLE_BOND] = - { - .baseHP = 72, - .baseAttack = 95, - .baseDefense = 67, - .baseSpeed = 122, - .baseSpAttack = 103, - .baseSpDefense = 71, - .type1 = TYPE_WATER, - .type2 = TYPE_DARK, - .catchRate = 45, - .expYield = 239, - .evYield_Speed = 3, - .genderRatio = MON_MALE, - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_BATTLE_BOND, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = TRUE, - }, - - [SPECIES_GRENINJA_ASH] = - { - .baseHP = 72, - .baseAttack = 145, - .baseDefense = 67, - .baseSpeed = 132, - .baseSpAttack = 153, - .baseSpDefense = 71, - .type1 = TYPE_WATER, - .type2 = TYPE_DARK, - .catchRate = 45, - .expYield = 288, - .evYield_Speed = 3, - .genderRatio = MON_MALE, - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_BATTLE_BOND, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = TRUE, - }, - - [SPECIES_VIVILLON_POLAR] = VIVILLON_BASE_STATS(BODY_COLOR_BLUE), - [SPECIES_VIVILLON_TUNDRA] = VIVILLON_BASE_STATS(BODY_COLOR_BLUE), - [SPECIES_VIVILLON_CONTINENTAL] = VIVILLON_BASE_STATS(BODY_COLOR_YELLOW), - [SPECIES_VIVILLON_GARDEN] = VIVILLON_BASE_STATS(BODY_COLOR_GREEN), - [SPECIES_VIVILLON_ELEGANT] = VIVILLON_BASE_STATS(BODY_COLOR_PURPLE), - [SPECIES_VIVILLON_MEADOW] = VIVILLON_BASE_STATS(BODY_COLOR_PINK), - [SPECIES_VIVILLON_MODERN] = VIVILLON_BASE_STATS(BODY_COLOR_RED), - [SPECIES_VIVILLON_MARINE] = VIVILLON_BASE_STATS(BODY_COLOR_BLUE), - [SPECIES_VIVILLON_ARCHIPELAGO] = VIVILLON_BASE_STATS(BODY_COLOR_BROWN), - [SPECIES_VIVILLON_HIGH_PLAINS] = VIVILLON_BASE_STATS(BODY_COLOR_BROWN), - [SPECIES_VIVILLON_SANDSTORM] = VIVILLON_BASE_STATS(BODY_COLOR_BROWN), - [SPECIES_VIVILLON_RIVER] = VIVILLON_BASE_STATS(BODY_COLOR_BROWN), - [SPECIES_VIVILLON_MONSOON] = VIVILLON_BASE_STATS(BODY_COLOR_GRAY), - [SPECIES_VIVILLON_SAVANNA] = VIVILLON_BASE_STATS(BODY_COLOR_GREEN), - [SPECIES_VIVILLON_SUN] = VIVILLON_BASE_STATS(BODY_COLOR_RED), - [SPECIES_VIVILLON_OCEAN] = VIVILLON_BASE_STATS(BODY_COLOR_RED), - [SPECIES_VIVILLON_JUNGLE] = VIVILLON_BASE_STATS(BODY_COLOR_GREEN), - [SPECIES_VIVILLON_FANCY] = VIVILLON_BASE_STATS(BODY_COLOR_PINK), - [SPECIES_VIVILLON_POKE_BALL] = VIVILLON_BASE_STATS(BODY_COLOR_RED), - - [SPECIES_FLABEBE_YELLOW_FLOWER] = FLABEBE_BASE_STATS, - [SPECIES_FLABEBE_ORANGE_FLOWER] = FLABEBE_BASE_STATS, - [SPECIES_FLABEBE_BLUE_FLOWER] = FLABEBE_BASE_STATS, - [SPECIES_FLABEBE_WHITE_FLOWER] = FLABEBE_BASE_STATS, - - [SPECIES_FLOETTE_YELLOW_FLOWER] = FLOETTE_BASE_STATS, - [SPECIES_FLOETTE_ORANGE_FLOWER] = FLOETTE_BASE_STATS, - [SPECIES_FLOETTE_BLUE_FLOWER] = FLOETTE_BASE_STATS, - [SPECIES_FLOETTE_WHITE_FLOWER] = FLOETTE_BASE_STATS, - - [SPECIES_FLOETTE_ETERNAL_FLOWER] = - { - .baseHP = 74, - .baseAttack = 65, - .baseDefense = 67, - .baseSpeed = 92, - .baseSpAttack = 125, - .baseSpDefense = 128, - .type1 = TYPE_FAIRY, - .type2 = TYPE_FAIRY, - .catchRate = 120, - .expYield = 243, - .evYield_SpDefense = 2, - .genderRatio = MON_FEMALE, - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - }, - - [SPECIES_FLORGES_YELLOW_FLOWER] = FLORGES_BASE_STATS, - [SPECIES_FLORGES_ORANGE_FLOWER] = FLORGES_BASE_STATS, - [SPECIES_FLORGES_BLUE_FLOWER] = FLORGES_BASE_STATS, - [SPECIES_FLORGES_WHITE_FLOWER] = FLORGES_BASE_STATS, - - [SPECIES_FURFROU_HEART_TRIM] = FURFROU_BASE_STATS(FLIP), - [SPECIES_FURFROU_STAR_TRIM] = FURFROU_BASE_STATS(FLIP), - [SPECIES_FURFROU_DIAMOND_TRIM] = FURFROU_BASE_STATS(FLIP), - [SPECIES_FURFROU_DEBUTANTE_TRIM] = FURFROU_BASE_STATS(NO_FLIP), - [SPECIES_FURFROU_MATRON_TRIM] = FURFROU_BASE_STATS(FLIP), - [SPECIES_FURFROU_DANDY_TRIM] = FURFROU_BASE_STATS(FLIP), - [SPECIES_FURFROU_LA_REINE_TRIM] = FURFROU_BASE_STATS(FLIP), - [SPECIES_FURFROU_KABUKI_TRIM] = FURFROU_BASE_STATS(FLIP), - [SPECIES_FURFROU_PHARAOH_TRIM] = FURFROU_BASE_STATS(FLIP), - - [SPECIES_MEOWSTIC_FEMALE] = - { - .baseHP = 74, - .baseAttack = 48, - .baseDefense = 76, - .baseSpeed = 104, - .baseSpAttack = 83, - .baseSpDefense = 81, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_PSYCHIC, - .catchRate = 75, - .expYield = 163, - .evYield_Speed = 2, - .genderRatio = MON_FEMALE, - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_COMPETITIVE}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - }, - - [SPECIES_AEGISLASH_BLADE] = - { - .baseHP = 60, - .baseDefense = 50, - .baseSpeed = 60, - #if P_UPDATED_STATS >= GEN_8 - .baseAttack = 140, - .baseSpAttack = 140, - #else - .baseAttack = 150, - .baseSpAttack = 150, - #endif - .baseSpDefense = 50, - .type1 = TYPE_STEEL, - .type2 = TYPE_GHOST, - .catchRate = 45, - .expYield = 234, - .evYield_Defense = 2, - .evYield_SpDefense = 1, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_MINERAL, - .eggGroup2 = EGG_GROUP_MINERAL, - .abilities = {ABILITY_STANCE_CHANGE, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, - }, - - [SPECIES_PUMPKABOO_SMALL] = - { - .baseHP = 44, - .baseAttack = 66, - .baseDefense = 70, - .baseSpeed = 56, - .baseSpAttack = 44, - .baseSpDefense = 55, - PUMKPABOO_MISC_STATS, - }, - - [SPECIES_PUMPKABOO_LARGE] = - { - .baseHP = 54, - .baseAttack = 66, - .baseDefense = 70, - .baseSpeed = 46, - .baseSpAttack = 44, - .baseSpDefense = 55, - PUMKPABOO_MISC_STATS, - }, - - [SPECIES_PUMPKABOO_SUPER] = - { - .baseHP = 59, - .baseAttack = 66, - .baseDefense = 70, - .baseSpeed = 41, - .baseSpAttack = 44, - .baseSpDefense = 55, - .itemCommon = ITEM_MIRACLE_SEED, - .itemRare = ITEM_MIRACLE_SEED, - PUMKPABOO_MISC_STATS, - }, - - [SPECIES_GOURGEIST_SMALL] = - { - .baseHP = 55, - .baseAttack = 85, - .baseDefense = 122, - .baseSpeed = 99, - .baseSpAttack = 58, - .baseSpDefense = 75, - GOURGEIST_MISC_STATS, - }, - - [SPECIES_GOURGEIST_LARGE] = - { - .baseHP = 75, - .baseAttack = 95, - .baseDefense = 122, - .baseSpeed = 69, - .baseSpAttack = 58, - .baseSpDefense = 75, - GOURGEIST_MISC_STATS, - }, - - [SPECIES_GOURGEIST_SUPER] = - { - .baseHP = 85, - .baseAttack = 100, - .baseDefense = 122, - .baseSpeed = 54, - .baseSpAttack = 58, - .baseSpDefense = 75, - .itemCommon = ITEM_MIRACLE_SEED, - .itemRare = ITEM_MIRACLE_SEED, - GOURGEIST_MISC_STATS, - }, - - [SPECIES_XERNEAS_ACTIVE] = XERNEAS_BASE_STATS, - - [SPECIES_ZYGARDE_10] = ZYGARDE_10_BASE_STATS(ABILITY_AURA_BREAK), - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = ZYGARDE_50_BASE_STATS(ABILITY_POWER_CONSTRUCT), - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = ZYGARDE_50_BASE_STATS(ABILITY_POWER_CONSTRUCT), - - [SPECIES_ZYGARDE_COMPLETE] = - { - .baseHP = 216, - .baseAttack = 100, - .baseDefense = 121, - .baseSpeed = 85, - .baseSpAttack = 91, - .baseSpDefense = 95, - .type1 = TYPE_DRAGON, - .type2 = TYPE_GROUND, - .catchRate = 3, - .expYield = 319, - .evYield_HP = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_POWER_CONSTRUCT, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLACK, - .noFlip = TRUE, - .flags = FLAG_LEGENDARY, - }, - - [SPECIES_HOOPA_UNBOUND] = - { - .baseHP = 80, - .baseAttack = 160, - .baseDefense = 60, - .baseSpeed = 80, - .baseSpAttack = 170, - .baseSpDefense = 130, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_DARK, - .catchRate = 3, - .expYield = 270, - .evYield_SpAttack = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 100, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_MAGICIAN, ABILITY_NONE}, - .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, - .flags = FLAG_MYTHICAL, - }, -#endif - -#if P_GEN_7_POKEMON == TRUE - [SPECIES_ORICORIO_POM_POM] = ORICORIO_BASE_STATS(TYPE_ELECTRIC, BODY_COLOR_YELLOW), - [SPECIES_ORICORIO_PAU] = ORICORIO_BASE_STATS(TYPE_PSYCHIC, BODY_COLOR_PINK), - [SPECIES_ORICORIO_SENSU] = ORICORIO_BASE_STATS(TYPE_GHOST, BODY_COLOR_PURPLE), - - [SPECIES_ROCKRUFF_OWN_TEMPO] = ROCKRUFF_BASE_STATS(ABILITY_OWN_TEMPO, ABILITY_NONE, ABILITY_NONE), - - [SPECIES_LYCANROC_MIDNIGHT] = - { - .baseHP = 85, - .baseAttack = 115, - .baseDefense = 75, - .baseSpeed = 82, - .baseSpAttack = 55, - .baseSpDefense = 75, - .type1 = TYPE_ROCK, - .type2 = TYPE_ROCK, - .catchRate = 90, - .expYield = 170, - .evYield_Attack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_NO_GUARD}, - .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, - }, - - [SPECIES_LYCANROC_DUSK] = - { - .baseHP = 75, - .baseAttack = 117, - .baseDefense = 65, - .baseSpeed = 110, - .baseSpAttack = 55, - .baseSpDefense = 65, - .type1 = TYPE_ROCK, - .type2 = TYPE_ROCK, - .catchRate = 90, - .expYield = 170, - .evYield_Attack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_TOUGH_CLAWS, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, - }, - - [SPECIES_WISHIWASHI_SCHOOL] = - { - .baseHP = 45, - .baseAttack = 140, - .baseDefense = 130, - .baseSpeed = 30, - .baseSpAttack = 140, - .baseSpDefense = 135, - .type1 = TYPE_WATER, - .type2 = TYPE_WATER, - .catchRate = 60, - .expYield = 61, - .evYield_HP = 1, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_FAST, - .eggGroup1 = EGG_GROUP_WATER_2, - .eggGroup2 = EGG_GROUP_WATER_2, - .abilities = {ABILITY_SCHOOLING, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - }, - - [SPECIES_SILVALLY_FIGHTING] = SILVALLY_BASE_STATS(TYPE_FIGHTING), - [SPECIES_SILVALLY_FLYING] = SILVALLY_BASE_STATS(TYPE_FLYING), - [SPECIES_SILVALLY_POISON] = SILVALLY_BASE_STATS(TYPE_POISON), - [SPECIES_SILVALLY_GROUND] = SILVALLY_BASE_STATS(TYPE_GROUND), - [SPECIES_SILVALLY_ROCK] = SILVALLY_BASE_STATS(TYPE_ROCK), - [SPECIES_SILVALLY_BUG] = SILVALLY_BASE_STATS(TYPE_BUG), - [SPECIES_SILVALLY_GHOST] = SILVALLY_BASE_STATS(TYPE_GHOST), - [SPECIES_SILVALLY_STEEL] = SILVALLY_BASE_STATS(TYPE_STEEL), - [SPECIES_SILVALLY_FIRE] = SILVALLY_BASE_STATS(TYPE_FIRE), - [SPECIES_SILVALLY_WATER] = SILVALLY_BASE_STATS(TYPE_WATER), - [SPECIES_SILVALLY_GRASS] = SILVALLY_BASE_STATS(TYPE_GRASS), - [SPECIES_SILVALLY_ELECTRIC] = SILVALLY_BASE_STATS(TYPE_ELECTRIC), - [SPECIES_SILVALLY_PSYCHIC] = SILVALLY_BASE_STATS(TYPE_PSYCHIC), - [SPECIES_SILVALLY_ICE] = SILVALLY_BASE_STATS(TYPE_ICE), - [SPECIES_SILVALLY_DRAGON] = SILVALLY_BASE_STATS(TYPE_DRAGON), - [SPECIES_SILVALLY_DARK] = SILVALLY_BASE_STATS(TYPE_DARK), - [SPECIES_SILVALLY_FAIRY] = SILVALLY_BASE_STATS(TYPE_FAIRY), - - [SPECIES_MINIOR_METEOR_ORANGE] = MINIOR_METEOR_BASE_STATS, - [SPECIES_MINIOR_METEOR_YELLOW] = MINIOR_METEOR_BASE_STATS, - [SPECIES_MINIOR_METEOR_GREEN] = MINIOR_METEOR_BASE_STATS, - [SPECIES_MINIOR_METEOR_BLUE] = MINIOR_METEOR_BASE_STATS, - [SPECIES_MINIOR_METEOR_INDIGO] = MINIOR_METEOR_BASE_STATS, - [SPECIES_MINIOR_METEOR_VIOLET] = MINIOR_METEOR_BASE_STATS, - - [SPECIES_MINIOR_CORE_RED] = MINIOR_CORE_BASE_STATS(BODY_COLOR_RED), - [SPECIES_MINIOR_CORE_ORANGE] = MINIOR_CORE_BASE_STATS(BODY_COLOR_RED), - [SPECIES_MINIOR_CORE_YELLOW] = MINIOR_CORE_BASE_STATS(BODY_COLOR_YELLOW), - [SPECIES_MINIOR_CORE_GREEN] = MINIOR_CORE_BASE_STATS(BODY_COLOR_GREEN), - [SPECIES_MINIOR_CORE_BLUE] = MINIOR_CORE_BASE_STATS(BODY_COLOR_BLUE), - [SPECIES_MINIOR_CORE_INDIGO] = MINIOR_CORE_BASE_STATS(BODY_COLOR_BLUE), - [SPECIES_MINIOR_CORE_VIOLET] = MINIOR_CORE_BASE_STATS(BODY_COLOR_PURPLE), - - [SPECIES_MIMIKYU_BUSTED] = MIMIKYU_BASE_STATS, - - [SPECIES_NECROZMA_DUSK_MANE] = - { - .baseHP = 97, - .baseAttack = 157, - .baseDefense = 127, - .baseSpeed = 77, - .baseSpAttack = 113, - .baseSpDefense = 109, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_STEEL, - .catchRate = 255, - .expYield = 306, - .evYield_Attack = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRISM_ARMOR, ABILITY_NONE}, - .bodyColor = BODY_COLOR_YELLOW, - .noFlip = TRUE, - .flags = FLAG_LEGENDARY, - }, - - [SPECIES_NECROZMA_DAWN_WINGS] = - { - .baseHP = 97, - .baseAttack = 113, - .baseDefense = 109, - .baseSpeed = 77, - .baseSpAttack = 157, - .baseSpDefense = 127, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_GHOST, - .catchRate = 255, - .expYield = 306, - .evYield_SpAttack = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_PRISM_ARMOR, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = TRUE, - .flags = FLAG_LEGENDARY, - }, - - [SPECIES_NECROZMA_ULTRA] = - { - .baseHP = 97, - .baseAttack = 167, - .baseDefense = 97, - .baseSpeed = 129, - .baseSpAttack = 167, - .baseSpDefense = 97, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_DRAGON, - .catchRate = 255, - .expYield = 339, - .evYield_Attack = 1, - .evYield_Speed = 1, - .evYield_SpAttack = 1, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_NEUROFORCE, ABILITY_NONE}, - .bodyColor = BODY_COLOR_YELLOW, - .noFlip = TRUE, - .flags = FLAG_LEGENDARY, - }, - - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = MAGEARNA_BASE_STATS(BODY_COLOR_RED), -#endif - #if P_GEN_8_POKEMON == TRUE - [SPECIES_CRAMORANT_GULPING] = CRAMORANT_BASE_STATS, - [SPECIES_CRAMORANT_GORGING] = CRAMORANT_BASE_STATS, - - [SPECIES_TOXTRICITY_LOW_KEY] = TOXTRICITY_BASE_STATS(ABILITY_MINUS), - - [SPECIES_SINISTEA_ANTIQUE] = SINISTEA_BASE_STATS, - - [SPECIES_POLTEAGEIST_ANTIQUE] = POLTEAGEIST_BASE_STATS, - - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_PINK), - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_GREEN), - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_BLUE), - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_YELLOW), - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = ALCREMIE_BASE_STATS(BODY_COLOR_WHITE), - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_YELLOW), - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_BROWN), - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_YELLOW), - - [SPECIES_EISCUE_NOICE_FACE] = - { - .baseHP = 75, - .baseAttack = 80, - .baseDefense = 70, - .baseSpeed = 130, - .baseSpAttack = 65, - .baseSpDefense = 50, - .type1 = TYPE_ICE, - .type2 = TYPE_ICE, - .catchRate = 60, - .expYield = 165, - .evYield_Defense = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 25, - .friendship = 70, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_WATER_1, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_ICE_FACE, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - }, - - [SPECIES_INDEEDEE_FEMALE] = - { - .baseHP = 70, - .baseAttack = 55, - .baseDefense = 65, - .baseSpeed = 85, - .baseSpAttack = 95, - .baseSpDefense = 105, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_NORMAL, - .catchRate = 30, - .expYield = 166, - .evYield_SpDefense = 2, - .genderRatio = MON_FEMALE, - .eggCycles = 40, - .friendship = 140, - .growthRate = GROWTH_FAST, - .eggGroup1 = EGG_GROUP_FAIRY, - .eggGroup2 = EGG_GROUP_FAIRY, - .abilities = {ABILITY_OWN_TEMPO, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE}, - .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, - }, - - [SPECIES_MORPEKO_HANGRY] = MORPEKO_BASE_STATS, - - [SPECIES_ZACIAN_CROWNED_SWORD] = - { - .baseHP = 92, - .baseAttack = 170, - .baseDefense = 115, - .baseSpeed = 148, - .baseSpAttack = 80, - .baseSpDefense = 115, - .type1 = TYPE_FAIRY, - .type2 = TYPE_STEEL, - .catchRate = 10, - .expYield = 360, - .evYield_Speed = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_INTREPID_SWORD, ABILITY_NONE}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, - }, - - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = - { - .baseHP = 92, - .baseAttack = 130, - .baseDefense = 145, - .baseSpeed = 128, - .baseSpAttack = 80, - .baseSpDefense = 145, - .type1 = TYPE_FIGHTING, - .type2 = TYPE_STEEL, - .catchRate = 10, - .expYield = 360, - .evYield_Speed = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE}, - .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, - }, [SPECIES_ETERNATUS_ETERNAMAX] = { @@ -26646,8 +26356,6 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_ZARUDE_DADA] = ZARUDE_BASE_STATS, - [SPECIES_CALYREX_ICE_RIDER] = { .baseHP = 100, diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index a04d036fee..5c258229ee 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -19,17 +19,20 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PIDGEOTTO] = {{EVO_LEVEL, 36, SPECIES_PIDGEOT}}, [SPECIES_PIDGEOT] = {{EVO_MEGA_EVOLUTION, ITEM_PIDGEOTITE, SPECIES_PIDGEOT_MEGA}}, [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE}}, + [SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}}, [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW}}, [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK}}, [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU_ALOLAN}}, [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH}}, + [SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}}, [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA}}, [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}}, [SPECIES_NIDORAN_M] = {{EVO_LEVEL, 16, SPECIES_NIDORINO}}, [SPECIES_NIDORINO] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}}, [SPECIES_CLEFAIRY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}}, [SPECIES_VULPIX] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}}, + [SPECIES_VULPIX_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}}, [SPECIES_JIGGLYPUFF] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}}, [SPECIES_ZUBAT] = {{EVO_LEVEL, 22, SPECIES_GOLBAT}}, [SPECIES_GOLBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_CROBAT}}, @@ -39,7 +42,12 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PARAS] = {{EVO_LEVEL, 24, SPECIES_PARASECT}}, [SPECIES_VENONAT] = {{EVO_LEVEL, 31, SPECIES_VENOMOTH}}, [SPECIES_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO}}, + [SPECIES_DIGLETT_ALOLAN] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}}, [SPECIES_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_PERSIAN}}, + [SPECIES_MEOWTH_ALOLAN] = {{EVO_FRIENDSHIP, 28, SPECIES_PERSIAN_ALOLAN}}, +#if P_GEN_8_POKEMON == TRUE + [SPECIES_MEOWTH_GALARIAN] = {{EVO_LEVEL, 28, SPECIES_PERRSERKER}}, +#endif [SPECIES_PSYDUCK] = {{EVO_LEVEL, 33, SPECIES_GOLDUCK}}, [SPECIES_MANKEY] = {{EVO_LEVEL, 28, SPECIES_PRIMEAPE}}, [SPECIES_GROWLITHE] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}}, @@ -55,19 +63,28 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_WEEPINBELL] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}}, [SPECIES_TENTACOOL] = {{EVO_LEVEL, 30, SPECIES_TENTACRUEL}}, [SPECIES_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_GRAVELER}}, + [SPECIES_GEODUDE_ALOLAN] = {{EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}}, [SPECIES_GRAVELER] = {{EVO_TRADE, 0, SPECIES_GOLEM}}, + [SPECIES_GRAVELER_ALOLAN] = {{EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}}, [SPECIES_PONYTA] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}}, + [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}}, [SPECIES_SLOWPOKE] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO}, {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}}, + [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN}, + {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}}, [SPECIES_SLOWBRO] = {{EVO_MEGA_EVOLUTION, ITEM_SLOWBRONITE, SPECIES_SLOWBRO_MEGA}}, [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}}, #if P_GEN_4_POKEMON == TRUE [SPECIES_MAGNETON] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}}, +#endif +#if P_GEN_8_POKEMON == TRUE + [SPECIES_FARFETCHD_GALARIAN] = {{EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}}, #endif [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}}, [SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}}, [SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}}, + [SPECIES_GRIMER_ALOLAN] = {{EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}}, [SPECIES_SHELLDER] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}}, [SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER}}, [SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR}}, @@ -97,6 +114,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}}, [SPECIES_GOLDEEN] = {{EVO_LEVEL, 33, SPECIES_SEAKING}}, [SPECIES_STARYU] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}}, +#if P_GEN_8_POKEMON == TRUE + [SPECIES_MR_MIME_GALARIAN] = {{EVO_LEVEL, 42, SPECIES_MR_RIME}}, +#endif [SPECIES_SCYTHER] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}}, #if P_GEN_4_POKEMON == TRUE [SPECIES_ELECTABUZZ] = {{EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}}, @@ -179,6 +199,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE}}, #if P_GEN_4_POKEMON == TRUE [SPECIES_PILOSWINE] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_MAMOSWINE}}, +#endif +#if P_GEN_8_POKEMON == TRUE + [SPECIES_CORSOLA_GALARIAN] = {{EVO_LEVEL, 38, SPECIES_CURSOLA}}, #endif [SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}}, [SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}}, @@ -207,6 +230,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SWAMPERT] = {{EVO_MEGA_EVOLUTION, ITEM_SWAMPERTITE, SPECIES_SWAMPERT_MEGA}}, [SPECIES_POOCHYENA] = {{EVO_LEVEL, 18, SPECIES_MIGHTYENA}}, [SPECIES_ZIGZAGOON] = {{EVO_LEVEL, 20, SPECIES_LINOONE}}, + [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, +#if P_GEN_8_POKEMON == TRUE + [SPECIES_LINOONE_GALARIAN] = {{EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}}, +#endif [SPECIES_WURMPLE] = {{EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}}, [SPECIES_SILCOON] = {{EVO_LEVEL, 10, SPECIES_BEAUTIFLY}}, @@ -298,7 +325,6 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_RAYQUAZA] = {{EVO_MOVE_MEGA_EVOLUTION, MOVE_DRAGON_ASCENT, SPECIES_RAYQUAZA_MEGA}}, #if P_GEN_4_POKEMON == TRUE - // Gens 4-7 [SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}}, [SPECIES_GROTLE] = {{EVO_LEVEL, 32, SPECIES_TORTERRA}}, [SPECIES_CHIMCHAR] = {{EVO_LEVEL, 14, SPECIES_MONFERNO}}, @@ -316,6 +342,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SHIELDON] = {{EVO_LEVEL, 30, SPECIES_BASTIODON}}, [SPECIES_BURMY_PLANT_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_PLANT_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, + [SPECIES_BURMY_SANDY_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK}, + {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, + [SPECIES_BURMY_TRASH_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK}, + {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, [SPECIES_COMBEE] = {{EVO_LEVEL_FEMALE, 21, SPECIES_VESPIQUEN}}, [SPECIES_BUIZEL] = {{EVO_LEVEL, 26, SPECIES_FLOATZEL}}, [SPECIES_CHERUBI] = {{EVO_LEVEL, 25, SPECIES_CHERRIM_OVERCAST}}, @@ -381,10 +411,14 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PETILIL] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_LILLIGANT}}, [SPECIES_SANDILE] = {{EVO_LEVEL, 29, SPECIES_KROKOROK}}, [SPECIES_KROKOROK] = {{EVO_LEVEL, 40, SPECIES_KROOKODILE}}, - [SPECIES_DARUMAKA] = {{EVO_LEVEL, 35, SPECIES_DARMANITAN}}, + [SPECIES_DARUMAKA] = {{EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}}, + [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}}, [SPECIES_DWEBBLE] = {{EVO_LEVEL, 34, SPECIES_CRUSTLE}}, [SPECIES_SCRAGGY] = {{EVO_LEVEL, 39, SPECIES_SCRAFTY}}, [SPECIES_YAMASK] = {{EVO_LEVEL, 34, SPECIES_COFAGRIGUS}}, +#if P_GEN_8_POKEMON == TRUE + [SPECIES_YAMASK_GALARIAN] = {{EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}}, +#endif [SPECIES_TIRTOUGA] = {{EVO_LEVEL, 37, SPECIES_CARRACOSTA}}, [SPECIES_ARCHEN] = {{EVO_LEVEL, 37, SPECIES_ARCHEOPS}}, [SPECIES_TRUBBISH] = {{EVO_LEVEL, 36, SPECIES_GARBODOR}}, @@ -397,7 +431,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_DUCKLETT] = {{EVO_LEVEL, 35, SPECIES_SWANNA}}, [SPECIES_VANILLITE] = {{EVO_LEVEL, 35, SPECIES_VANILLISH}}, [SPECIES_VANILLISH] = {{EVO_LEVEL, 47, SPECIES_VANILLUXE}}, - [SPECIES_DEERLING] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK}}, + [SPECIES_DEERLING_SPRING] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SPRING}}, + [SPECIES_DEERLING_SUMMER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}}, + [SPECIES_DEERLING_AUTUMN] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}}, + [SPECIES_DEERLING_WINTER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}}, [SPECIES_KARRABLAST] = {{EVO_TRADE_SPECIFIC_MON, SPECIES_SHELMET, SPECIES_ESCAVALIER}}, [SPECIES_FOONGUS] = {{EVO_LEVEL, 39, SPECIES_AMOONGUSS}}, [SPECIES_FRILLISH] = {{EVO_LEVEL, 40, SPECIES_JELLICENT}}, @@ -436,11 +473,19 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SCATTERBUG] = {{EVO_LEVEL, 9, SPECIES_SPEWPA}}, [SPECIES_SPEWPA] = {{EVO_LEVEL, 12, SPECIES_VIVILLON}}, [SPECIES_LITLEO] = {{EVO_LEVEL, 35, SPECIES_PYROAR}}, - [SPECIES_FLABEBE] = {{EVO_LEVEL, 19, SPECIES_FLOETTE}}, - [SPECIES_FLOETTE] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES}}, + [SPECIES_FLABEBE_RED_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_RED_FLOWER}}, + [SPECIES_FLABEBE_YELLOW_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_YELLOW_FLOWER}}, + [SPECIES_FLABEBE_ORANGE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_ORANGE_FLOWER}}, + [SPECIES_FLABEBE_BLUE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_BLUE_FLOWER}}, + [SPECIES_FLABEBE_WHITE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_WHITE_FLOWER}}, + [SPECIES_FLOETTE_RED_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_RED_FLOWER}}, + [SPECIES_FLOETTE_YELLOW_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_YELLOW_FLOWER}}, + [SPECIES_FLOETTE_ORANGE_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_ORANGE_FLOWER}}, + [SPECIES_FLOETTE_BLUE_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_BLUE_FLOWER}}, + [SPECIES_FLOETTE_WHITE_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_WHITE_FLOWER}}, [SPECIES_SKIDDO] = {{EVO_LEVEL, 32, SPECIES_GOGOAT}}, [SPECIES_PANCHAM] = {{EVO_LEVEL_DARK_TYPE_MON_IN_PARTY, 32, SPECIES_PANGORO}}, - [SPECIES_ESPURR] = {{EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC}, + [SPECIES_ESPURR] = {{EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_MALE}, {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}}, [SPECIES_HONEDGE] = {{EVO_LEVEL, 35, SPECIES_DOUBLADE}}, [SPECIES_DOUBLADE] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_AEGISLASH}}, @@ -456,7 +501,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GOOMY] = {{EVO_LEVEL, 40, SPECIES_SLIGGOO}}, [SPECIES_SLIGGOO] = {{EVO_LEVEL_RAIN, 50, SPECIES_GOODRA}}, [SPECIES_PHANTUMP] = {{EVO_TRADE, 0, SPECIES_TREVENANT}}, - [SPECIES_PUMPKABOO] = {{EVO_TRADE, 0, SPECIES_GOURGEIST}}, + [SPECIES_PUMPKABOO_AVERAGE] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_AVERAGE}}, + [SPECIES_PUMPKABOO_SMALL] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SMALL}}, + [SPECIES_PUMPKABOO_LARGE] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}}, + [SPECIES_PUMPKABOO_SUPER] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER}}, [SPECIES_BERGMITE] = {{EVO_LEVEL, 37, SPECIES_AVALUGG}}, [SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN}}, [SPECIES_DIANCIE] = {{EVO_MEGA_EVOLUTION, ITEM_DIANCITE, SPECIES_DIANCIE_MEGA}}, @@ -476,8 +524,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_VIKAVOLT}}, [SPECIES_CRABRAWLER] = {{EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_CRABOMINABLE}}, [SPECIES_CUTIEFLY] = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE}}, - [SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC}, + [SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC_MIDDAY}, {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_MIDNIGHT}}, + [SPECIES_ROCKRUFF_OWN_TEMPO] = {{EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}}, [SPECIES_MAREANIE] = {{EVO_LEVEL, 38, SPECIES_TOXAPEX}}, [SPECIES_MUDBRAY] = {{EVO_LEVEL, 30, SPECIES_MUDSDALE}}, [SPECIES_DEWPIDER] = {{EVO_LEVEL, 22, SPECIES_ARAQUANID}}, @@ -520,85 +569,22 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}}, [SPECIES_SILICOBRA] = {{EVO_LEVEL, 36, SPECIES_SANDACONDA}}, [SPECIES_ARROKUDA] = {{EVO_LEVEL, 26, SPECIES_BARRASKEWDA}}, - [SPECIES_TOXEL] = {{EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY}, + [SPECIES_TOXEL] = {{EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED}, {EVO_LEVEL_NATURE_LOW_KEY, 30, SPECIES_TOXTRICITY_LOW_KEY}}, [SPECIES_SIZZLIPEDE] = {{EVO_LEVEL, 28, SPECIES_CENTISKORCH}}, [SPECIES_CLOBBOPUS] = {{EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT}}, - [SPECIES_SINISTEA] = {{EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST}}, + [SPECIES_SINISTEA_PHONY] = {{EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST_PHONY}}, + [SPECIES_SINISTEA_ANTIQUE] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_ANTIQUE}}, [SPECIES_HATENNA] = {{EVO_LEVEL, 32, SPECIES_HATTREM}}, [SPECIES_HATTREM] = {{EVO_LEVEL, 42, SPECIES_HATTERENE}}, [SPECIES_IMPIDIMP] = {{EVO_LEVEL, 32, SPECIES_MORGREM}}, [SPECIES_MORGREM] = {{EVO_LEVEL, 42, SPECIES_GRIMMSNARL}}, - [SPECIES_MILCERY] = {{EVO_LEVEL, 0, SPECIES_ALCREMIE}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL}}, + [SPECIES_MILCERY] = {{EVO_ALCREMIE, 0, SPECIES_ALCREMIE}}, [SPECIES_SNOM] = {{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH}}, [SPECIES_CUFANT] = {{EVO_LEVEL, 34, SPECIES_COPPERAJAH}}, [SPECIES_DREEPY] = {{EVO_LEVEL, 50, SPECIES_DRAKLOAK}}, [SPECIES_DRAKLOAK] = {{EVO_LEVEL, 60, SPECIES_DRAGAPULT}}, [SPECIES_KUBFU] = {{EVO_DARK_SCROLL, 0, SPECIES_URSHIFU}, {EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}}, -#endif - [SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}}, - [SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}}, - [SPECIES_VULPIX_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}}, - [SPECIES_DIGLETT_ALOLAN] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}}, - [SPECIES_MEOWTH_ALOLAN] = {{EVO_FRIENDSHIP, 28, SPECIES_PERSIAN_ALOLAN}}, - [SPECIES_GEODUDE_ALOLAN] = {{EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}}, - [SPECIES_GRAVELER_ALOLAN] = {{EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}}, - [SPECIES_GRIMER_ALOLAN] = {{EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}}, -#if P_GEN_8_POKEMON == TRUE - [SPECIES_MEOWTH_GALARIAN] = {{EVO_LEVEL, 28, SPECIES_PERRSERKER}}, -#endif - [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}}, - [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN}, - {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}}, -#if P_GEN_8_POKEMON == TRUE - [SPECIES_FARFETCHD_GALARIAN] = {{EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}}, - [SPECIES_MR_MIME_GALARIAN] = {{EVO_LEVEL, 42, SPECIES_MR_RIME}}, - [SPECIES_CORSOLA_GALARIAN] = {{EVO_LEVEL, 38, SPECIES_CURSOLA}}, - [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, - [SPECIES_LINOONE_GALARIAN] = {{EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}}, - [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}}, - [SPECIES_YAMASK_GALARIAN] = {{EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}}, -#else - [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, - [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}}, -#endif -#if P_GEN_4_POKEMON == TRUE - [SPECIES_BURMY_SANDY_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK}, - {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, - [SPECIES_BURMY_TRASH_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK}, - {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DEERLING_SUMMER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}}, - [SPECIES_DEERLING_AUTUMN] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}}, - [SPECIES_DEERLING_WINTER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}}, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_FLABEBE_YELLOW_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_YELLOW_FLOWER}}, - [SPECIES_FLABEBE_ORANGE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_ORANGE_FLOWER}}, - [SPECIES_FLABEBE_BLUE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_BLUE_FLOWER}}, - [SPECIES_FLABEBE_WHITE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_WHITE_FLOWER}}, - [SPECIES_FLOETTE_YELLOW_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_YELLOW_FLOWER}}, - [SPECIES_FLOETTE_ORANGE_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_ORANGE_FLOWER}}, - [SPECIES_FLOETTE_BLUE_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_BLUE_FLOWER}}, - [SPECIES_FLOETTE_WHITE_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_WHITE_FLOWER}}, - [SPECIES_PUMPKABOO_SMALL] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SMALL}}, - [SPECIES_PUMPKABOO_LARGE] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}}, - [SPECIES_PUMPKABOO_SUPER] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER}}, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_ROCKRUFF_OWN_TEMPO] = {{EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}}, -#endif -#if P_GEN_8_POKEMON == TRUE - [SPECIES_SINISTEA_ANTIQUE] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_ANTIQUE}}, #endif }; diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index a060716c32..da629f11fd 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -25,13 +25,13 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_ARCEUS_FAIRY] = sArceusFormChangeTable, #endif #if P_GEN_5_POKEMON == TRUE - [SPECIES_TORNADUS] = sTornadusFormChangeTable, + [SPECIES_TORNADUS_INCARNATE] = sTornadusFormChangeTable, [SPECIES_TORNADUS_THERIAN] = sTornadusFormChangeTable, [SPECIES_THUNDURUS] = sThundurusFormChangeTable, [SPECIES_THUNDURUS_THERIAN] = sThundurusFormChangeTable, [SPECIES_LANDORUS] = sLandorusFormChangeTable, [SPECIES_LANDORUS_THERIAN] = sLandorusFormChangeTable, - [SPECIES_KELDEO] = sKeldeoFormChangeTable, + [SPECIES_KELDEO_ORDINARY] = sKeldeoFormChangeTable, [SPECIES_KELDEO_RESOLUTE] = sKeldeoFormChangeTable, [SPECIES_GENESECT] = sGenesectFormChangeTable, [SPECIES_GENESECT_DOUSE_DRIVE] = sGenesectFormChangeTable, @@ -40,17 +40,17 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormChangeTable, #endif #if P_GEN_6_POKEMON == TRUE - [SPECIES_XERNEAS] = sXerneasFormChangeTable, + [SPECIES_XERNEAS_NEUTRAL] = sXerneasFormChangeTable, [SPECIES_XERNEAS_ACTIVE] = sXerneasFormChangeTable, - [SPECIES_HOOPA] = sHoopaFormChangeTable, + [SPECIES_HOOPA_CONFINED] = sHoopaFormChangeTable, [SPECIES_HOOPA_UNBOUND] = sHoopaFormChangeTable, #endif #if P_GEN_7_POKEMON == TRUE - [SPECIES_ORICORIO] = sOricorioFormChangeTable, + [SPECIES_ORICORIO_BAILE] = sOricorioFormChangeTable, [SPECIES_ORICORIO_POM_POM] = sOricorioFormChangeTable, [SPECIES_ORICORIO_PAU] = sOricorioFormChangeTable, [SPECIES_ORICORIO_SENSU] = sOricorioFormChangeTable, - [SPECIES_SILVALLY] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_NORMAL] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_BUG] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_DARK] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_DRAGON] = sSilvallyFormChangeTable, @@ -68,12 +68,12 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_SILVALLY_ROCK] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable, - [SPECIES_ZACIAN] = sZacianFormChangeTable, - [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianFormChangeTable, - [SPECIES_ZAMAZENTA] = sZamazentaFormChangeTable, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaFormChangeTable, #endif #if P_GEN_8_POKEMON == TRUE + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sZacianFormChangeTable, + [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianFormChangeTable, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaFormChangeTable, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaFormChangeTable, [SPECIES_ENAMORUS] = sEnamorusFormChangeTable, [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormChangeTable, #endif diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index 687d9b25f0..b370eb4fb0 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -99,25 +99,25 @@ static const struct FormChange sArceusFormChangeTable[] = { #if P_GEN_5_POKEMON == TRUE static const struct FormChange sTornadusFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, - {FORM_ITEM_USE, SPECIES_TORNADUS, ITEM_REVEAL_GLASS}, + {FORM_ITEM_USE, SPECIES_TORNADUS_INCARNATE, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; static const struct FormChange sThundurusFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_THUNDURUS_THERIAN, ITEM_REVEAL_GLASS}, - {FORM_ITEM_USE, SPECIES_THUNDURUS, ITEM_REVEAL_GLASS}, + {FORM_ITEM_USE, SPECIES_THUNDURUS_INCARNATE, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; static const struct FormChange sLandorusFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_LANDORUS_THERIAN, ITEM_REVEAL_GLASS}, - {FORM_ITEM_USE, SPECIES_LANDORUS, ITEM_REVEAL_GLASS}, + {FORM_ITEM_USE, SPECIES_LANDORUS_INCARNATE, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; static const struct FormChange sKeldeoFormChangeTable[] = { // {FORM_MOVE, SPECIES_KELDEO_RESOLUTE, MOVE_SECRET_SWORD, WHEN_LEARNED}, - // {FORM_MOVE, SPECIES_KELDEO, MOVE_SECRET_SWORD, WHEN_FORGOTTEN}, + // {FORM_MOVE, SPECIES_KELDEO_ORDINARY, MOVE_SECRET_SWORD, WHEN_FORGOTTEN}, {FORM_CHANGE_END}, }; @@ -134,20 +134,20 @@ static const struct FormChange sGenesectFormChangeTable[] = { #if P_GEN_6_POKEMON == TRUE static const struct FormChange sXerneasFormChangeTable[] = { {FORM_BATTLE_BEGIN, SPECIES_XERNEAS_ACTIVE}, - {FORM_BATTLE_END, SPECIES_XERNEAS, }, + {FORM_BATTLE_END, SPECIES_XERNEAS_NEUTRAL,}, {FORM_CHANGE_END}, }; static const struct FormChange sHoopaFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA}, - // {FORM_WITHDRAW, SPECIES_HOOPA}, + {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE}, + {FORM_WITHDRAW, SPECIES_HOOPA_CONFINED}, {FORM_CHANGE_END}, }; #endif #if P_GEN_7_POKEMON == TRUE static const struct FormChange sOricorioFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_ORICORIO, ITEM_RED_NECTAR}, + {FORM_ITEM_USE, SPECIES_ORICORIO_BAILE, ITEM_RED_NECTAR}, {FORM_ITEM_USE, SPECIES_ORICORIO_POM_POM, ITEM_YELLOW_NECTAR}, {FORM_ITEM_USE, SPECIES_ORICORIO_PAU, ITEM_PINK_NECTAR}, {FORM_ITEM_USE, SPECIES_ORICORIO_SENSU, ITEM_PURPLE_NECTAR}, @@ -155,7 +155,7 @@ static const struct FormChange sOricorioFormChangeTable[] = { }; static const struct FormChange sSilvallyFormChangeTable[] = { - {FORM_ITEM_HOLD, SPECIES_SILVALLY, ITEM_NONE, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD, SPECIES_SILVALLY_NORMAL, ITEM_NONE, ABILITY_RKS_SYSTEM}, {FORM_ITEM_HOLD, SPECIES_SILVALLY_FIGHTING, ITEM_FIGHTING_MEMORY, ABILITY_RKS_SYSTEM}, {FORM_ITEM_HOLD, SPECIES_SILVALLY_FLYING, ITEM_FLYING_MEMORY, ABILITY_RKS_SYSTEM}, {FORM_ITEM_HOLD, SPECIES_SILVALLY_POISON, ITEM_POISON_MEMORY, ABILITY_RKS_SYSTEM}, @@ -179,20 +179,20 @@ static const struct FormChange sSilvallyFormChangeTable[] = { #if P_GEN_8_POKEMON == TRUE static const struct FormChange sZacianFormChangeTable[] = { - {FORM_BATTLE_BEGIN, SPECIES_ZACIAN_CROWNED_SWORD, ITEM_RUSTED_SWORD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BLADE}, - {FORM_BATTLE_END, SPECIES_ZACIAN, ITEM_RUSTED_SWORD, MOVE_BEHEMOTH_BLADE, MOVE_IRON_HEAD}, + {FORM_BATTLE_BEGIN, SPECIES_ZACIAN_CROWNED_SWORD, ITEM_RUSTED_SWORD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BLADE}, + {FORM_BATTLE_END, SPECIES_ZACIAN_HERO_OF_MANY_BATTLES, ITEM_RUSTED_SWORD, MOVE_BEHEMOTH_BLADE, MOVE_IRON_HEAD}, {FORM_CHANGE_END}, }; static const struct FormChange sZamazentaFormChangeTable[] = { - {FORM_BATTLE_BEGIN, SPECIES_ZAMAZENTA_CROWNED_SHIELD, ITEM_RUSTED_SHIELD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BASH}, - {FORM_BATTLE_END, SPECIES_ZAMAZENTA, ITEM_RUSTED_SHIELD, MOVE_BEHEMOTH_BASH, MOVE_IRON_HEAD}, + {FORM_BATTLE_BEGIN, SPECIES_ZAMAZENTA_CROWNED_SHIELD, ITEM_RUSTED_SHIELD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BASH}, + {FORM_BATTLE_END, SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES, ITEM_RUSTED_SHIELD, MOVE_BEHEMOTH_BASH, MOVE_IRON_HEAD}, {FORM_CHANGE_END}, }; static const struct FormChange sEnamorusFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_ENAMORUS, ITEM_REVEAL_GLASS}, - {FORM_ITEM_USE, SPECIES_ENAMORUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_ITEM_USE, SPECIES_ENAMORUS_INCARNATE, ITEM_REVEAL_GLASS}, + {FORM_ITEM_USE, SPECIES_ENAMORUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; #endif diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index a294394556..0aefaf03aa 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -1,56 +1,124 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = { [SPECIES_VENUSAUR] = sVenusaurFormSpeciesIdTable, + [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, [SPECIES_CHARIZARD] = sCharizardFormSpeciesIdTable, + [SPECIES_CHARIZARD_MEGA_X] = sCharizardFormSpeciesIdTable, + [SPECIES_CHARIZARD_MEGA_Y] = sCharizardFormSpeciesIdTable, [SPECIES_BLASTOISE] = sBlastoiseFormSpeciesIdTable, + [SPECIES_BLASTOISE_MEGA] = sBlastoiseFormSpeciesIdTable, [SPECIES_BEEDRILL] = sBeedrillFormSpeciesIdTable, + [SPECIES_BEEDRILL_MEGA] = sBeedrillFormSpeciesIdTable, [SPECIES_PIDGEOT] = sPidgeotFormSpeciesIdTable, + [SPECIES_PIDGEOT_MEGA] = sPidgeotFormSpeciesIdTable, [SPECIES_RATTATA] = sRattataFormSpeciesIdTable, + [SPECIES_RATTATA_ALOLAN] = sRattataFormSpeciesIdTable, [SPECIES_RATICATE] = sRaticateFormSpeciesIdTable, + [SPECIES_RATICATE_ALOLAN] = sRaticateFormSpeciesIdTable, [SPECIES_PIKACHU] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_ROCK_STAR] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_BELLE] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_POP_STAR] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_PH_D] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_LIBRE] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_ORIGINAL_CAP] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_HOENN_CAP] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_SINNOH_CAP] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_UNOVA_CAP] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_KALOS_CAP] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_ALOLA_CAP] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_PARTNER_CAP] = sPikachuFormSpeciesIdTable, + [SPECIES_PIKACHU_WORLD_CAP] = sPikachuFormSpeciesIdTable, [SPECIES_RAICHU] = sRaichuFormSpeciesIdTable, + [SPECIES_RAICHU_ALOLAN] = sRaichuFormSpeciesIdTable, [SPECIES_SANDSHREW] = sSandshrewFormSpeciesIdTable, + [SPECIES_SANDSHREW_ALOLAN] = sSandshrewFormSpeciesIdTable, [SPECIES_SANDSLASH] = sSandslashFormSpeciesIdTable, + [SPECIES_SANDSLASH_ALOLAN] = sSandslashFormSpeciesIdTable, [SPECIES_VULPIX] = sVulpixFormSpeciesIdTable, + [SPECIES_VULPIX_ALOLAN] = sVulpixFormSpeciesIdTable, [SPECIES_NINETALES] = sNinetalesFormSpeciesIdTable, + [SPECIES_NINETALES_ALOLAN] = sNinetalesFormSpeciesIdTable, [SPECIES_DIGLETT] = sDiglettFormSpeciesIdTable, + [SPECIES_DIGLETT_ALOLAN] = sDiglettFormSpeciesIdTable, [SPECIES_DUGTRIO] = sDugtrioFormSpeciesIdTable, + [SPECIES_DUGTRIO_ALOLAN] = sDugtrioFormSpeciesIdTable, [SPECIES_MEOWTH] = sMeowthFormSpeciesIdTable, + [SPECIES_MEOWTH_ALOLAN] = sMeowthFormSpeciesIdTable, + [SPECIES_MEOWTH_GALARIAN] = sMeowthFormSpeciesIdTable, [SPECIES_PERSIAN] = sPersianFormSpeciesIdTable, + [SPECIES_PERSIAN_ALOLAN] = sPersianFormSpeciesIdTable, [SPECIES_ALAKAZAM] = sAlakazamFormSpeciesIdTable, + [SPECIES_ALAKAZAM_MEGA] = sAlakazamFormSpeciesIdTable, [SPECIES_GROWLITHE] = sGrowlitheFormSpeciesIdTable, + [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheFormSpeciesIdTable, [SPECIES_ARCANINE] = sArcanineFormSpeciesIdTable, + [SPECIES_ARCANINE_HISUIAN] = sArcanineFormSpeciesIdTable, [SPECIES_GEODUDE] = sGeodudeFormSpeciesIdTable, + [SPECIES_GEODUDE_ALOLAN] = sGeodudeFormSpeciesIdTable, [SPECIES_GRAVELER] = sGravelerFormSpeciesIdTable, + [SPECIES_GRAVELER_ALOLAN] = sGravelerFormSpeciesIdTable, [SPECIES_GOLEM] = sGolemFormSpeciesIdTable, + [SPECIES_GOLEM_ALOLAN] = sGolemFormSpeciesIdTable, [SPECIES_PONYTA] = sPonytaFormSpeciesIdTable, + [SPECIES_PONYTA_GALARIAN] = sPonytaFormSpeciesIdTable, [SPECIES_RAPIDASH] = sRapidashFormSpeciesIdTable, + [SPECIES_RAPIDASH_GALARIAN] = sRapidashFormSpeciesIdTable, [SPECIES_SLOWPOKE] = sSlowpokeFormSpeciesIdTable, + [SPECIES_SLOWPOKE_GALARIAN] = sSlowpokeFormSpeciesIdTable, [SPECIES_SLOWBRO] = sSlowbroFormSpeciesIdTable, + [SPECIES_SLOWBRO_MEGA] = sSlowbroFormSpeciesIdTable, + [SPECIES_SLOWBRO_GALARIAN] = sSlowbroFormSpeciesIdTable, [SPECIES_FARFETCHD] = sFarfetchdFormSpeciesIdTable, + [SPECIES_FARFETCHD_GALARIAN] = sFarfetchdFormSpeciesIdTable, [SPECIES_GRIMER] = sGrimerFormSpeciesIdTable, + [SPECIES_GRIMER_ALOLAN] = sGrimerFormSpeciesIdTable, [SPECIES_MUK] = sMukFormSpeciesIdTable, + [SPECIES_MUK_ALOLAN] = sMukFormSpeciesIdTable, [SPECIES_GENGAR] = sGengarFormSpeciesIdTable, + [SPECIES_GENGAR_MEGA] = sGengarFormSpeciesIdTable, [SPECIES_VOLTORB] = sVoltorbFormSpeciesIdTable, + [SPECIES_VOLTORB_HISUIAN] = sVoltorbFormSpeciesIdTable, [SPECIES_ELECTRODE] = sElectrodeFormSpeciesIdTable, + [SPECIES_ELECTRODE_HISUIAN] = sElectrodeFormSpeciesIdTable, [SPECIES_EXEGGUTOR] = sExeggutorFormSpeciesIdTable, + [SPECIES_EXEGGUTOR_ALOLAN] = sExeggutorFormSpeciesIdTable, [SPECIES_MAROWAK] = sMarowakFormSpeciesIdTable, + [SPECIES_MAROWAK_ALOLAN] = sMarowakFormSpeciesIdTable, [SPECIES_WEEZING] = sWeezingFormSpeciesIdTable, + [SPECIES_WEEZING_GALARIAN] = sWeezingFormSpeciesIdTable, [SPECIES_KANGASKHAN] = sKangaskhanFormSpeciesIdTable, + [SPECIES_KANGASKHAN_MEGA] = sKangaskhanFormSpeciesIdTable, [SPECIES_MR_MIME] = sMrMimeFormSpeciesIdTable, + [SPECIES_MR_MIME_GALARIAN] = sMrMimeFormSpeciesIdTable, [SPECIES_PINSIR] = sPinsirFormSpeciesIdTable, + [SPECIES_PINSIR_MEGA] = sPinsirFormSpeciesIdTable, [SPECIES_GYARADOS] = sGyaradosFormSpeciesIdTable, + [SPECIES_GYARADOS_MEGA] = sGyaradosFormSpeciesIdTable, [SPECIES_AERODACTYL] = sAerodactylFormSpeciesIdTable, + [SPECIES_AERODACTYL_MEGA] = sAerodactylFormSpeciesIdTable, [SPECIES_ARTICUNO] = sArticunoFormSpeciesIdTable, + [SPECIES_ARTICUNO_GALARIAN] = sArticunoFormSpeciesIdTable, [SPECIES_ZAPDOS] = sZapdosFormSpeciesIdTable, + [SPECIES_ZAPDOS_GALARIAN] = sZapdosFormSpeciesIdTable, [SPECIES_MOLTRES] = sMoltresFormSpeciesIdTable, + [SPECIES_MOLTRES_GALARIAN] = sMoltresFormSpeciesIdTable, [SPECIES_MEWTWO] = sMewtwoFormSpeciesIdTable, + [SPECIES_MEWTWO_MEGA_X] = sMewtwoFormSpeciesIdTable, + [SPECIES_MEWTWO_MEGA_Y] = sMewtwoFormSpeciesIdTable, [SPECIES_TYPHLOSION] = sTyphlosionFormSpeciesIdTable, + [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionFormSpeciesIdTable, [SPECIES_PICHU] = sPichuFormSpeciesIdTable, + [SPECIES_PICHU_SPIKY_EARED] = sPichuFormSpeciesIdTable, [SPECIES_AMPHAROS] = sAmpharosFormSpeciesIdTable, + [SPECIES_AMPHAROS_MEGA] = sAmpharosFormSpeciesIdTable, [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable, + [SPECIES_SLOWKING_GALARIAN] = sSlowkingFormSpeciesIdTable, [SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable, + [SPECIES_QWILFISH_HISUIAN] = sQwilfishFormSpeciesIdTable, [SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable, + [SPECIES_SNEASEL_HISUIAN] = sSneaselFormSpeciesIdTable, [SPECIES_UNOWN] = sUnownFormSpeciesIdTable, [SPECIES_UNOWN_B] = sUnownFormSpeciesIdTable, [SPECIES_UNOWN_C] = sUnownFormSpeciesIdTable, @@ -80,45 +148,74 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_UNOWN_EMARK] = sUnownFormSpeciesIdTable, [SPECIES_UNOWN_QMARK] = sUnownFormSpeciesIdTable, [SPECIES_STEELIX] = sSteelixFormSpeciesIdTable, + [SPECIES_STEELIX_MEGA] = sSteelixFormSpeciesIdTable, [SPECIES_SCIZOR] = sScizorFormSpeciesIdTable, + [SPECIES_SCIZOR_MEGA] = sScizorFormSpeciesIdTable, [SPECIES_HERACROSS] = sHeracrossFormSpeciesIdTable, + [SPECIES_HERACROSS_MEGA] = sHeracrossFormSpeciesIdTable, [SPECIES_CORSOLA] = sCorsolaFormSpeciesIdTable, + [SPECIES_CORSOLA_GALARIAN] = sCorsolaFormSpeciesIdTable, [SPECIES_HOUNDOOM] = sHoundoomFormSpeciesIdTable, + [SPECIES_HOUNDOOM_MEGA] = sHoundoomFormSpeciesIdTable, [SPECIES_TYRANITAR] = sTyranitarFormSpeciesIdTable, + [SPECIES_TYRANITAR_MEGA] = sTyranitarFormSpeciesIdTable, [SPECIES_SCEPTILE] = sSceptileFormSpeciesIdTable, + [SPECIES_SCEPTILE_MEGA] = sSceptileFormSpeciesIdTable, [SPECIES_BLAZIKEN] = sBlazikenFormSpeciesIdTable, + [SPECIES_BLAZIKEN_MEGA] = sBlazikenFormSpeciesIdTable, [SPECIES_SWAMPERT] = sSwampertFormSpeciesIdTable, + [SPECIES_SWAMPERT_MEGA] = sSwampertFormSpeciesIdTable, [SPECIES_ZIGZAGOON] = sZigzagoonFormSpeciesIdTable, + [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonFormSpeciesIdTable, [SPECIES_LINOONE] = sLinooneFormSpeciesIdTable, + [SPECIES_LINOONE_GALARIAN] = sLinooneFormSpeciesIdTable, [SPECIES_GARDEVOIR] = sGardevoirFormSpeciesIdTable, + [SPECIES_GARDEVOIR_MEGA] = sGardevoirFormSpeciesIdTable, [SPECIES_SABLEYE] = sSableyeFormSpeciesIdTable, + [SPECIES_SABLEYE_MEGA] = sSableyeFormSpeciesIdTable, [SPECIES_MAWILE] = sMawileFormSpeciesIdTable, + [SPECIES_MAWILE_MEGA] = sMawileFormSpeciesIdTable, [SPECIES_AGGRON] = sAggronFormSpeciesIdTable, + [SPECIES_AGGRON_MEGA] = sAggronFormSpeciesIdTable, [SPECIES_MEDICHAM] = sMedichamFormSpeciesIdTable, + [SPECIES_MEDICHAM_MEGA] = sMedichamFormSpeciesIdTable, [SPECIES_MANECTRIC] = sManectricFormSpeciesIdTable, + [SPECIES_MANECTRIC_MEGA] = sManectricFormSpeciesIdTable, [SPECIES_SHARPEDO] = sSharpedoFormSpeciesIdTable, + [SPECIES_SHARPEDO_MEGA] = sSharpedoFormSpeciesIdTable, [SPECIES_CAMERUPT] = sCameruptFormSpeciesIdTable, + [SPECIES_CAMERUPT_MEGA] = sCameruptFormSpeciesIdTable, [SPECIES_ALTARIA] = sAltariaFormSpeciesIdTable, + [SPECIES_ALTARIA_MEGA] = sAltariaFormSpeciesIdTable, [SPECIES_CASTFORM_NORMAL] = sCastformFormSpeciesIdTable, [SPECIES_CASTFORM_SUNNY] = sCastformFormSpeciesIdTable, [SPECIES_CASTFORM_RAINY] = sCastformFormSpeciesIdTable, [SPECIES_CASTFORM_SNOWY] = sCastformFormSpeciesIdTable, [SPECIES_BANETTE] = sBanetteFormSpeciesIdTable, + [SPECIES_BANETTE_MEGA] = sBanetteFormSpeciesIdTable, [SPECIES_ABSOL] = sAbsolFormSpeciesIdTable, + [SPECIES_ABSOL_MEGA] = sAbsolFormSpeciesIdTable, [SPECIES_GLALIE] = sGlalieFormSpeciesIdTable, + [SPECIES_GLALIE_MEGA] = sGlalieFormSpeciesIdTable, [SPECIES_SALAMENCE] = sSalamenceFormSpeciesIdTable, + [SPECIES_SALAMENCE_MEGA] = sSalamenceFormSpeciesIdTable, [SPECIES_METAGROSS] = sMetagrossFormSpeciesIdTable, + [SPECIES_METAGROSS_MEGA] = sMetagrossFormSpeciesIdTable, [SPECIES_LATIAS] = sLatiasFormSpeciesIdTable, + [SPECIES_LATIAS_MEGA] = sLatiasFormSpeciesIdTable, [SPECIES_LATIOS] = sLatiosFormSpeciesIdTable, + [SPECIES_LATIOS_MEGA] = sLatiosFormSpeciesIdTable, [SPECIES_KYOGRE] = sKyogreFormSpeciesIdTable, + [SPECIES_KYOGRE_PRIMAL] = sKyogreFormSpeciesIdTable, [SPECIES_GROUDON] = sGroudonFormSpeciesIdTable, + [SPECIES_GROUDON_PRIMAL] = sGroudonFormSpeciesIdTable, [SPECIES_RAYQUAZA] = sRayquazaFormSpeciesIdTable, + [SPECIES_RAYQUAZA_MEGA] = sRayquazaFormSpeciesIdTable, [SPECIES_DEOXYS_NORMAL] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_ATTACK] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_DEFENSE] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_SPEED] = sDeoxysFormSpeciesIdTable, #if P_GEN_4_POKEMON == TRUE -// Diamond and Pearl [SPECIES_BURMY_PLANT_CLOAK] = sBurmyFormSpeciesIdTable, [SPECIES_BURMY_SANDY_CLOAK] = sBurmyFormSpeciesIdTable, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyFormSpeciesIdTable, @@ -129,18 +226,32 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_CHERRIM_SUNSHINE] = sCherrimFormSpeciesIdTable, [SPECIES_SHELLOS_WEST_SEA] = sShellosFormSpeciesIdTable, [SPECIES_SHELLOS_EAST_SEA] = sShellosFormSpeciesIdTable, - [SPECIES_GASTRODON] = sGastrodonFormSpeciesIdTable, + [SPECIES_GASTRODON_WEST_SEA] = sGastrodonFormSpeciesIdTable, [SPECIES_GASTRODON_EAST_SEA] = sGastrodonFormSpeciesIdTable, [SPECIES_LOPUNNY] = sLopunnyFormSpeciesIdTable, + [SPECIES_LOPUNNY_MEGA] = sLopunnyFormSpeciesIdTable, [SPECIES_GARCHOMP] = sGarchompFormSpeciesIdTable, + [SPECIES_GARCHOMP_MEGA] = sGarchompFormSpeciesIdTable, [SPECIES_LUCARIO] = sLucarioFormSpeciesIdTable, + [SPECIES_LUCARIO_MEGA] = sLucarioFormSpeciesIdTable, [SPECIES_ABOMASNOW] = sAbomasnowFormSpeciesIdTable, + [SPECIES_ABOMASNOW_MEGA] = sAbomasnowFormSpeciesIdTable, [SPECIES_GALLADE] = sGalladeFormSpeciesIdTable, + [SPECIES_GALLADE_MEGA] = sGalladeFormSpeciesIdTable, [SPECIES_ROTOM] = sRotomFormSpeciesIdTable, + [SPECIES_ROTOM_HEAT] = sRotomFormSpeciesIdTable, + [SPECIES_ROTOM_WASH] = sRotomFormSpeciesIdTable, + [SPECIES_ROTOM_FROST] = sRotomFormSpeciesIdTable, + [SPECIES_ROTOM_FAN] = sRotomFormSpeciesIdTable, + [SPECIES_ROTOM_MOW] = sRotomFormSpeciesIdTable, [SPECIES_DIALGA] = sDialgaFormSpeciesIdTable, + [SPECIES_DIALGA_ORIGIN] = sDialgaFormSpeciesIdTable, [SPECIES_PALKIA] = sPalkiaFormSpeciesIdTable, + [SPECIES_PALKIA_ORIGIN] = sPalkiaFormSpeciesIdTable, [SPECIES_GIRATINA_ALTERED] = sGiratinaFormSpeciesIdTable, + [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormSpeciesIdTable, [SPECIES_SHAYMIN_LAND] = sShayminFormSpeciesIdTable, + [SPECIES_SHAYMIN_SKY] = sShayminFormSpeciesIdTable, [SPECIES_ARCEUS_NORMAL] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_FIGHTING] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_FLYING] = sArceusFormSpeciesIdTable, @@ -158,264 +269,66 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ARCEUS_ICE] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_DRAGON] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_DARK] = sArceusFormSpeciesIdTable, -// Platinum - [SPECIES_ROTOM_HEAT] = sRotomFormSpeciesIdTable, - [SPECIES_ROTOM_WASH] = sRotomFormSpeciesIdTable, - [SPECIES_ROTOM_FROST] = sRotomFormSpeciesIdTable, - [SPECIES_ROTOM_FAN] = sRotomFormSpeciesIdTable, - [SPECIES_ROTOM_MOW] = sRotomFormSpeciesIdTable, - [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormSpeciesIdTable, - [SPECIES_SHAYMIN_SKY] = sShayminFormSpeciesIdTable, + [SPECIES_ARCEUS_FAIRY] = sArceusFormSpeciesIdTable, #endif -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = sPichuFormSpeciesIdTable, - #if P_GEN_5_POKEMON == TRUE -// Black and White [SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable, + [SPECIES_SAMUROTT_HISUIAN] = sSamurottFormSpeciesIdTable, [SPECIES_AUDINO] = sAudinoFormSpeciesIdTable, + [SPECIES_AUDINO_MEGA] = sAudinoFormSpeciesIdTable, [SPECIES_BASCULIN_RED_STRIPED] = sBasculinFormSpeciesIdTable, [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinFormSpeciesIdTable, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinFormSpeciesIdTable, [SPECIES_LILLIGANT] = sLilligantFormSpeciesIdTable, + [SPECIES_LILLIGANT_HISUIAN] = sLilligantFormSpeciesIdTable, [SPECIES_DARUMAKA] = sDarumakaFormSpeciesIdTable, - [SPECIES_DARMANITAN] = sDarmanitanFormSpeciesIdTable, + [SPECIES_DARUMAKA_GALARIAN] = sDarumakaFormSpeciesIdTable, + [SPECIES_DARMANITAN_STANDARD_MODE] = sDarmanitanFormSpeciesIdTable, [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanFormSpeciesIdTable, - [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanFormSpeciesIdTable, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = sDarmanitanFormSpeciesIdTable, [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanFormSpeciesIdTable, - [SPECIES_YAMASK] = sYamaskFormSpeciesIdTable, + [SPECIES_YAMASK] = sYamaskFormSpeciesIdTable, + [SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable, [SPECIES_ZORUA] = sZoruaFormSpeciesIdTable, + [SPECIES_ZORUA_HISUIAN] = sZoruaFormSpeciesIdTable, [SPECIES_ZOROARK] = sZoroarkFormSpeciesIdTable, - [SPECIES_DEERLING] = sDeerlingFormSpeciesIdTable, + [SPECIES_ZOROARK_HISUIAN] = sZoroarkFormSpeciesIdTable, + [SPECIES_DEERLING_SPRING] = sDeerlingFormSpeciesIdTable, [SPECIES_DEERLING_SUMMER] = sDeerlingFormSpeciesIdTable, [SPECIES_DEERLING_AUTUMN] = sDeerlingFormSpeciesIdTable, [SPECIES_DEERLING_WINTER] = sDeerlingFormSpeciesIdTable, - [SPECIES_SAWSBUCK] = sSawsbuckFormSpeciesIdTable, + [SPECIES_SAWSBUCK_SPRING] = sSawsbuckFormSpeciesIdTable, [SPECIES_SAWSBUCK_SUMMER] = sSawsbuckFormSpeciesIdTable, [SPECIES_SAWSBUCK_AUTUMN] = sSawsbuckFormSpeciesIdTable, [SPECIES_SAWSBUCK_WINTER] = sSawsbuckFormSpeciesIdTable, [SPECIES_STUNFISK] = sStunfiskFormSpeciesIdTable, + [SPECIES_STUNFISK_GALARIAN] = sStunfiskFormSpeciesIdTable, [SPECIES_BRAVIARY] = sBraviaryFormSpeciesIdTable, - [SPECIES_TORNADUS] = sTornadusFormSpeciesIdTable, - [SPECIES_THUNDURUS] = sThundurusFormSpeciesIdTable, - [SPECIES_LANDORUS] = sLandorusFormSpeciesIdTable, + [SPECIES_BRAVIARY_HISUIAN] = sBraviaryFormSpeciesIdTable, + [SPECIES_TORNADUS_INCARNATE] = sTornadusFormSpeciesIdTable, + [SPECIES_TORNADUS_THERIAN] = sTornadusFormSpeciesIdTable, + [SPECIES_THUNDURUS_INCARNATE] = sThundurusFormSpeciesIdTable, + [SPECIES_THUNDURUS_THERIAN] = sThundurusFormSpeciesIdTable, + [SPECIES_LANDORUS_INCARNATE] = sLandorusFormSpeciesIdTable, + [SPECIES_LANDORUS_THERIAN] = sLandorusFormSpeciesIdTable, [SPECIES_KYUREM] = sKyuremFormSpeciesIdTable, - [SPECIES_KELDEO] = sKeldeoFormSpeciesIdTable, - [SPECIES_MELOETTA] = sMeloettaFormSpeciesIdTable, + [SPECIES_KYUREM_WHITE] = sKyuremFormSpeciesIdTable, + [SPECIES_KYUREM_BLACK] = sKyuremFormSpeciesIdTable, + [SPECIES_KELDEO_ORDINARY] = sKeldeoFormSpeciesIdTable, + [SPECIES_KELDEO_RESOLUTE] = sKeldeoFormSpeciesIdTable, + [SPECIES_MELOETTA_ARIA] = sMeloettaFormSpeciesIdTable, [SPECIES_MELOETTA_PIROUETTE] = sMeloettaFormSpeciesIdTable, [SPECIES_GENESECT] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_DOUSE_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormSpeciesIdTable, -// Black 2 and White 2 - [SPECIES_TORNADUS_THERIAN] = sTornadusFormSpeciesIdTable, - [SPECIES_THUNDURUS_THERIAN] = sThundurusFormSpeciesIdTable, - [SPECIES_LANDORUS_THERIAN] = sLandorusFormSpeciesIdTable, - [SPECIES_KYUREM_WHITE] = sKyuremFormSpeciesIdTable, - [SPECIES_KYUREM_BLACK] = sKyuremFormSpeciesIdTable, - [SPECIES_KELDEO_RESOLUTE] = sKeldeoFormSpeciesIdTable, #endif #if P_GEN_6_POKEMON == TRUE -// X and Y [SPECIES_GRENINJA] = sGreninjaFormSpeciesIdTable, - [SPECIES_VIVILLON] = sVivillonFormSpeciesIdTable, - [SPECIES_FLABEBE] = sFlabebeFormSpeciesIdTable, - [SPECIES_FLOETTE] = sFloetteFormSpeciesIdTable, - [SPECIES_FLORGES] = sFlorgesFormSpeciesIdTable, - [SPECIES_FURFROU] = sFurfrouFormSpeciesIdTable, - [SPECIES_MEOWSTIC] = sMeowsticFormSpeciesIdTable, - [SPECIES_AEGISLASH] = sAegislashFormSpeciesIdTable, - [SPECIES_SLIGGOO] = sSliggooFormSpeciesIdTable, - [SPECIES_GOODRA] = sGoodraFormSpeciesIdTable, - [SPECIES_PUMPKABOO] = sPumpkabooFormSpeciesIdTable, - [SPECIES_GOURGEIST] = sGourgeistFormSpeciesIdTable, - [SPECIES_AVALUGG] = sAvaluggFormSpeciesIdTable, - [SPECIES_XERNEAS] = sXerneasFormSpeciesIdTable, - [SPECIES_ZYGARDE] = sZygardeFormSpeciesIdTable, - [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable, - [SPECIES_HOOPA] = sHoopaFormSpeciesIdTable, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable, - [SPECIES_ORICORIO] = sOricorioFormSpeciesIdTable, - [SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable, - [SPECIES_LYCANROC] = sLycanrocFormSpeciesIdTable, - [SPECIES_WISHIWASHI] = sWishiwashiFormSpeciesIdTable, - [SPECIES_SILVALLY] = sSilvallyFormSpeciesIdTable, - [SPECIES_MINIOR] = sMiniorFormSpeciesIdTable, - [SPECIES_MIMIKYU] = sMimikyuFormSpeciesIdTable, - [SPECIES_NECROZMA] = sNecrozmaFormSpeciesIdTable, - [SPECIES_MAGEARNA] = sMagearnaFormSpeciesIdTable, -#endif -#if P_GEN_8_POKEMON == TRUE - [SPECIES_CRAMORANT] = sCramorantFormSpeciesIdTable, - [SPECIES_TOXTRICITY] = sToxtricityFormSpeciesIdTable, - [SPECIES_SINISTEA] = sSinisteaFormSpeciesIdTable, - [SPECIES_POLTEAGEIST] = sPolteageistFormSpeciesIdTable, - [SPECIES_ALCREMIE] = sAlcremieFormSpeciesIdTable, - [SPECIES_EISCUE] = sEiscueFormSpeciesIdTable, - [SPECIES_INDEEDEE] = sIndeedeeFormSpeciesIdTable, - [SPECIES_MORPEKO] = sMorpekoFormSpeciesIdTable, - [SPECIES_ZACIAN] = sZacianFormSpeciesIdTable, - [SPECIES_ZAMAZENTA] = sZamazentaFormSpeciesIdTable, - [SPECIES_ETERNATUS] = sEternatusFormSpeciesIdTable, - [SPECIES_URSHIFU] = sUrshifuFormSpeciesIdTable, - [SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable, - [SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable, - [SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable, -#endif - // Megas - [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, - [SPECIES_CHARIZARD_MEGA_X] = sCharizardFormSpeciesIdTable, - [SPECIES_CHARIZARD_MEGA_Y] = sCharizardFormSpeciesIdTable, - [SPECIES_BLASTOISE_MEGA] = sBlastoiseFormSpeciesIdTable, - [SPECIES_BEEDRILL_MEGA] = sBeedrillFormSpeciesIdTable, - [SPECIES_PIDGEOT_MEGA] = sPidgeotFormSpeciesIdTable, - [SPECIES_ALAKAZAM_MEGA] = sAlakazamFormSpeciesIdTable, - [SPECIES_SLOWBRO_MEGA] = sSlowbroFormSpeciesIdTable, - [SPECIES_GENGAR_MEGA] = sGengarFormSpeciesIdTable, - [SPECIES_KANGASKHAN_MEGA] = sKangaskhanFormSpeciesIdTable, - [SPECIES_PINSIR_MEGA] = sPinsirFormSpeciesIdTable, - [SPECIES_GYARADOS_MEGA] = sGyaradosFormSpeciesIdTable, - [SPECIES_AERODACTYL_MEGA] = sAerodactylFormSpeciesIdTable, - [SPECIES_MEWTWO_MEGA_X] = sMewtwoFormSpeciesIdTable, - [SPECIES_MEWTWO_MEGA_Y] = sMewtwoFormSpeciesIdTable, - [SPECIES_AMPHAROS_MEGA] = sAmpharosFormSpeciesIdTable, - [SPECIES_STEELIX_MEGA] = sSteelixFormSpeciesIdTable, - [SPECIES_SCIZOR_MEGA] = sScizorFormSpeciesIdTable, - [SPECIES_HERACROSS_MEGA] = sHeracrossFormSpeciesIdTable, - [SPECIES_HOUNDOOM_MEGA] = sHoundoomFormSpeciesIdTable, - [SPECIES_TYRANITAR_MEGA] = sTyranitarFormSpeciesIdTable, - [SPECIES_SCEPTILE_MEGA] = sSceptileFormSpeciesIdTable, - [SPECIES_BLAZIKEN_MEGA] = sBlazikenFormSpeciesIdTable, - [SPECIES_SWAMPERT_MEGA] = sSwampertFormSpeciesIdTable, - [SPECIES_GARDEVOIR_MEGA] = sGardevoirFormSpeciesIdTable, - [SPECIES_SABLEYE_MEGA] = sSableyeFormSpeciesIdTable, - [SPECIES_MAWILE_MEGA] = sMawileFormSpeciesIdTable, - [SPECIES_AGGRON_MEGA] = sAggronFormSpeciesIdTable, - [SPECIES_MEDICHAM_MEGA] = sMedichamFormSpeciesIdTable, - [SPECIES_MANECTRIC_MEGA] = sManectricFormSpeciesIdTable, - [SPECIES_SHARPEDO_MEGA] = sSharpedoFormSpeciesIdTable, - [SPECIES_CAMERUPT_MEGA] = sCameruptFormSpeciesIdTable, - [SPECIES_ALTARIA_MEGA] = sAltariaFormSpeciesIdTable, - [SPECIES_BANETTE_MEGA] = sBanetteFormSpeciesIdTable, - [SPECIES_ABSOL_MEGA] = sAbsolFormSpeciesIdTable, - [SPECIES_GLALIE_MEGA] = sGlalieFormSpeciesIdTable, - [SPECIES_SALAMENCE_MEGA] = sSalamenceFormSpeciesIdTable, - [SPECIES_METAGROSS_MEGA] = sMetagrossFormSpeciesIdTable, - [SPECIES_LATIAS_MEGA] = sLatiasFormSpeciesIdTable, - [SPECIES_LATIOS_MEGA] = sLatiosFormSpeciesIdTable, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA] = sLopunnyFormSpeciesIdTable, - [SPECIES_GARCHOMP_MEGA] = sGarchompFormSpeciesIdTable, - [SPECIES_LUCARIO_MEGA] = sLucarioFormSpeciesIdTable, - [SPECIES_ABOMASNOW_MEGA] = sAbomasnowFormSpeciesIdTable, - [SPECIES_GALLADE_MEGA] = sGalladeFormSpeciesIdTable, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA] = sAudinoFormSpeciesIdTable, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA] = sDiancieFormSpeciesIdTable, -#endif - // Special Mega + Primals - [SPECIES_RAYQUAZA_MEGA] = sRayquazaFormSpeciesIdTable, - [SPECIES_KYOGRE_PRIMAL] = sKyogreFormSpeciesIdTable, - [SPECIES_GROUDON_PRIMAL] = sGroudonFormSpeciesIdTable, - // Alolan Forms - [SPECIES_RATTATA_ALOLAN] = sRattataFormSpeciesIdTable, - [SPECIES_RATICATE_ALOLAN] = sRaticateFormSpeciesIdTable, - [SPECIES_RAICHU_ALOLAN] = sRaichuFormSpeciesIdTable, - [SPECIES_SANDSHREW_ALOLAN] = sSandshrewFormSpeciesIdTable, - [SPECIES_SANDSLASH_ALOLAN] = sSandslashFormSpeciesIdTable, - [SPECIES_VULPIX_ALOLAN] = sVulpixFormSpeciesIdTable, - [SPECIES_NINETALES_ALOLAN] = sNinetalesFormSpeciesIdTable, - [SPECIES_DIGLETT_ALOLAN] = sDiglettFormSpeciesIdTable, - [SPECIES_DUGTRIO_ALOLAN] = sDugtrioFormSpeciesIdTable, - [SPECIES_MEOWTH_ALOLAN] = sMeowthFormSpeciesIdTable, - [SPECIES_PERSIAN_ALOLAN] = sPersianFormSpeciesIdTable, - [SPECIES_GEODUDE_ALOLAN] = sGeodudeFormSpeciesIdTable, - [SPECIES_GRAVELER_ALOLAN] = sGravelerFormSpeciesIdTable, - [SPECIES_GOLEM_ALOLAN] = sGolemFormSpeciesIdTable, - [SPECIES_GRIMER_ALOLAN] = sGrimerFormSpeciesIdTable, - [SPECIES_MUK_ALOLAN] = sMukFormSpeciesIdTable, - [SPECIES_EXEGGUTOR_ALOLAN] = sExeggutorFormSpeciesIdTable, - [SPECIES_MAROWAK_ALOLAN] = sMarowakFormSpeciesIdTable, - // Galarian Forms - [SPECIES_MEOWTH_GALARIAN] = sMeowthFormSpeciesIdTable, - [SPECIES_PONYTA_GALARIAN] = sPonytaFormSpeciesIdTable, - [SPECIES_RAPIDASH_GALARIAN] = sRapidashFormSpeciesIdTable, - [SPECIES_SLOWPOKE_GALARIAN] = sSlowpokeFormSpeciesIdTable, - [SPECIES_SLOWBRO_GALARIAN] = sSlowbroFormSpeciesIdTable, - [SPECIES_FARFETCHD_GALARIAN] = sFarfetchdFormSpeciesIdTable, - [SPECIES_WEEZING_GALARIAN] = sWeezingFormSpeciesIdTable, - [SPECIES_MR_MIME_GALARIAN] = sMrMimeFormSpeciesIdTable, - [SPECIES_ARTICUNO_GALARIAN] = sArticunoFormSpeciesIdTable, - [SPECIES_ZAPDOS_GALARIAN] = sZapdosFormSpeciesIdTable, - [SPECIES_MOLTRES_GALARIAN] = sMoltresFormSpeciesIdTable, - [SPECIES_SLOWKING_GALARIAN] = sSlowkingFormSpeciesIdTable, - [SPECIES_CORSOLA_GALARIAN] = sCorsolaFormSpeciesIdTable, - [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonFormSpeciesIdTable, - [SPECIES_LINOONE_GALARIAN] = sLinooneFormSpeciesIdTable, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN] = sDarumakaFormSpeciesIdTable, - [SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable, - [SPECIES_STUNFISK_GALARIAN] = sStunfiskFormSpeciesIdTable, -#endif - //Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheFormSpeciesIdTable, - [SPECIES_ARCANINE_HISUIAN] = sArcanineFormSpeciesIdTable, - [SPECIES_VOLTORB_HISUIAN] = sVoltorbFormSpeciesIdTable, - [SPECIES_ELECTRODE_HISUIAN] = sElectrodeFormSpeciesIdTable, - [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionFormSpeciesIdTable, - [SPECIES_QWILFISH_HISUIAN] = sQwilfishFormSpeciesIdTable, - [SPECIES_SNEASEL_HISUIAN] = sSneaselFormSpeciesIdTable, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_SAMUROTT_HISUIAN] = sSamurottFormSpeciesIdTable, - [SPECIES_LILLIGANT_HISUIAN] = sLilligantFormSpeciesIdTable, - [SPECIES_ZORUA_HISUIAN] = sZoruaFormSpeciesIdTable, - [SPECIES_ZOROARK_HISUIAN] = sZoroarkFormSpeciesIdTable, - [SPECIES_BRAVIARY_HISUIAN] = sBraviaryFormSpeciesIdTable, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = sSliggooFormSpeciesIdTable, - [SPECIES_GOODRA_HISUIAN] = sGoodraFormSpeciesIdTable, - [SPECIES_AVALUGG_HISUIAN] = sAvaluggFormSpeciesIdTable, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, -#endif - // Misc Forms - // Cosplay Pikachu - [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_ROCK_STAR] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_BELLE] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_POP_STAR] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_PH_D] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_LIBRE] = sPikachuFormSpeciesIdTable, - // Cap Pikachu - [SPECIES_PIKACHU_ORIGINAL_CAP] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_HOENN_CAP] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_SINNOH_CAP] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_UNOVA_CAP] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_KALOS_CAP] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_ALOLA_CAP] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_PARTNER_CAP] = sPikachuFormSpeciesIdTable, - [SPECIES_PIKACHU_WORLD_CAP] = sPikachuFormSpeciesIdTable, -#if P_GEN_4_POKEMON == TRUE - // Origin Forme - [SPECIES_DIALGA_ORIGIN] = sDialgaFormSpeciesIdTable, - [SPECIES_PALKIA_ORIGIN] = sPalkiaFormSpeciesIdTable, - - [SPECIES_ARCEUS_FAIRY] = sArceusFormSpeciesIdTable, -#endif - -#if P_GEN_6_POKEMON == TRUE - // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaFormSpeciesIdTable, [SPECIES_GRENINJA_ASH] = sGreninjaFormSpeciesIdTable, - // Vivillon + [SPECIES_VIVILLON_ICY_SNOW] = sVivillonFormSpeciesIdTable, [SPECIES_VIVILLON_POLAR] = sVivillonFormSpeciesIdTable, [SPECIES_VIVILLON_TUNDRA] = sVivillonFormSpeciesIdTable, [SPECIES_VIVILLON_CONTINENTAL] = sVivillonFormSpeciesIdTable, @@ -435,23 +348,23 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_VIVILLON_JUNGLE] = sVivillonFormSpeciesIdTable, [SPECIES_VIVILLON_FANCY] = sVivillonFormSpeciesIdTable, [SPECIES_VIVILLON_POKE_BALL] = sVivillonFormSpeciesIdTable, - // Flabébé + [SPECIES_FLABEBE_RED_FLOWER] = sFlabebeFormSpeciesIdTable, [SPECIES_FLABEBE_YELLOW_FLOWER] = sFlabebeFormSpeciesIdTable, [SPECIES_FLABEBE_ORANGE_FLOWER] = sFlabebeFormSpeciesIdTable, [SPECIES_FLABEBE_BLUE_FLOWER] = sFlabebeFormSpeciesIdTable, [SPECIES_FLABEBE_WHITE_FLOWER] = sFlabebeFormSpeciesIdTable, - // Floette + [SPECIES_FLOETTE_RED_FLOWER] = sFloetteFormSpeciesIdTable, [SPECIES_FLOETTE_YELLOW_FLOWER] = sFloetteFormSpeciesIdTable, [SPECIES_FLOETTE_ORANGE_FLOWER] = sFloetteFormSpeciesIdTable, [SPECIES_FLOETTE_BLUE_FLOWER] = sFloetteFormSpeciesIdTable, [SPECIES_FLOETTE_WHITE_FLOWER] = sFloetteFormSpeciesIdTable, [SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteFormSpeciesIdTable, - // Florges + [SPECIES_FLORGES_RED_FLOWER] = sFlorgesFormSpeciesIdTable, [SPECIES_FLORGES_YELLOW_FLOWER] = sFlorgesFormSpeciesIdTable, [SPECIES_FLORGES_ORANGE_FLOWER] = sFlorgesFormSpeciesIdTable, [SPECIES_FLORGES_BLUE_FLOWER] = sFlorgesFormSpeciesIdTable, [SPECIES_FLORGES_WHITE_FLOWER] = sFlorgesFormSpeciesIdTable, - //Furfrou + [SPECIES_FURFROU_NATURAL] = sFurfrouFormSpeciesIdTable, [SPECIES_FURFROU_HEART_TRIM] = sFurfrouFormSpeciesIdTable, [SPECIES_FURFROU_STAR_TRIM] = sFurfrouFormSpeciesIdTable, [SPECIES_FURFROU_DIAMOND_TRIM] = sFurfrouFormSpeciesIdTable, @@ -461,41 +374,51 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_FURFROU_LA_REINE_TRIM] = sFurfrouFormSpeciesIdTable, [SPECIES_FURFROU_KABUKI_TRIM] = sFurfrouFormSpeciesIdTable, [SPECIES_FURFROU_PHARAOH_TRIM] = sFurfrouFormSpeciesIdTable, - // Meowstic + [SPECIES_MEOWSTIC_MALE] = sMeowsticFormSpeciesIdTable, [SPECIES_MEOWSTIC_FEMALE] = sMeowsticFormSpeciesIdTable, - // Aegislash + [SPECIES_AEGISLASH_SHIELD] = sAegislashFormSpeciesIdTable, [SPECIES_AEGISLASH_BLADE] = sAegislashFormSpeciesIdTable, - // Pumpkaboo + [SPECIES_SLIGGOO] = sSliggooFormSpeciesIdTable, + [SPECIES_SLIGGOO_HISUIAN] = sSliggooFormSpeciesIdTable, + [SPECIES_GOODRA] = sGoodraFormSpeciesIdTable, + [SPECIES_GOODRA_HISUIAN] = sGoodraFormSpeciesIdTable, + [SPECIES_PUMPKABOO_AVERAGE] = sPumpkabooFormSpeciesIdTable, [SPECIES_PUMPKABOO_SMALL] = sPumpkabooFormSpeciesIdTable, [SPECIES_PUMPKABOO_LARGE] = sPumpkabooFormSpeciesIdTable, [SPECIES_PUMPKABOO_SUPER] = sPumpkabooFormSpeciesIdTable, - // Gourgeist + [SPECIES_GOURGEIST_AVERAGE] = sGourgeistFormSpeciesIdTable, [SPECIES_GOURGEIST_SMALL] = sGourgeistFormSpeciesIdTable, [SPECIES_GOURGEIST_LARGE] = sGourgeistFormSpeciesIdTable, [SPECIES_GOURGEIST_SUPER] = sGourgeistFormSpeciesIdTable, - // Xerneas + [SPECIES_AVALUGG] = sAvaluggFormSpeciesIdTable, + [SPECIES_AVALUGG_HISUIAN] = sAvaluggFormSpeciesIdTable, + [SPECIES_XERNEAS_NEUTRAL] = sXerneasFormSpeciesIdTable, [SPECIES_XERNEAS_ACTIVE] = sXerneasFormSpeciesIdTable, - // Zygarde + [SPECIES_ZYGARDE_50] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE_10] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE_COMPLETE] = sZygardeFormSpeciesIdTable, - // Hoopa + [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable, + [SPECIES_DIANCIE_MEGA] = sDiancieFormSpeciesIdTable, + [SPECIES_HOOPA_CONFINED] = sHoopaFormSpeciesIdTable, [SPECIES_HOOPA_UNBOUND] = sHoopaFormSpeciesIdTable, #endif #if P_GEN_7_POKEMON == TRUE - // Oricorio + [SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable, + [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, + [SPECIES_ORICORIO_BAILE] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_POM_POM] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_PAU] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_SENSU] = sOricorioFormSpeciesIdTable, - // Rockruff + [SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable, [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffFormSpeciesIdTable, - // Lycanroc + [SPECIES_LYCANROC_MIDDAY] = sLycanrocFormSpeciesIdTable, [SPECIES_LYCANROC_MIDNIGHT] = sLycanrocFormSpeciesIdTable, [SPECIES_LYCANROC_DUSK] = sLycanrocFormSpeciesIdTable, - // Wishiwashi + [SPECIES_WISHIWASHI_SOLO] = sWishiwashiFormSpeciesIdTable, [SPECIES_WISHIWASHI_SCHOOL] = sWishiwashiFormSpeciesIdTable, - // Silvally + [SPECIES_SILVALLY_NORMAL] = sSilvallyFormSpeciesIdTable, [SPECIES_SILVALLY_FIGHTING] = sSilvallyFormSpeciesIdTable, [SPECIES_SILVALLY_FLYING] = sSilvallyFormSpeciesIdTable, [SPECIES_SILVALLY_POISON] = sSilvallyFormSpeciesIdTable, @@ -513,7 +436,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SILVALLY_DRAGON] = sSilvallyFormSpeciesIdTable, [SPECIES_SILVALLY_DARK] = sSilvallyFormSpeciesIdTable, [SPECIES_SILVALLY_FAIRY] = sSilvallyFormSpeciesIdTable, - // Minior + [SPECIES_MINIOR_METEOR_RED] = sMiniorFormSpeciesIdTable, [SPECIES_MINIOR_METEOR_ORANGE] = sMiniorFormSpeciesIdTable, [SPECIES_MINIOR_METEOR_YELLOW] = sMiniorFormSpeciesIdTable, [SPECIES_MINIOR_METEOR_GREEN] = sMiniorFormSpeciesIdTable, @@ -527,26 +450,26 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_MINIOR_CORE_BLUE] = sMiniorFormSpeciesIdTable, [SPECIES_MINIOR_CORE_INDIGO] = sMiniorFormSpeciesIdTable, [SPECIES_MINIOR_CORE_VIOLET] = sMiniorFormSpeciesIdTable, - // Mimikyu + [SPECIES_MIMIKYU_DISGUISED] = sMimikyuFormSpeciesIdTable, [SPECIES_MIMIKYU_BUSTED] = sMimikyuFormSpeciesIdTable, - // Necrozma + [SPECIES_NECROZMA] = sNecrozmaFormSpeciesIdTable, [SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaFormSpeciesIdTable, [SPECIES_NECROZMA_DAWN_WINGS] = sNecrozmaFormSpeciesIdTable, [SPECIES_NECROZMA_ULTRA] = sNecrozmaFormSpeciesIdTable, - // Magearna + [SPECIES_MAGEARNA] = sMagearnaFormSpeciesIdTable, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaFormSpeciesIdTable, #endif #if P_GEN_8_POKEMON == TRUE - // Cramorant + [SPECIES_CRAMORANT] = sCramorantFormSpeciesIdTable, [SPECIES_CRAMORANT_GULPING] = sCramorantFormSpeciesIdTable, [SPECIES_CRAMORANT_GORGING] = sCramorantFormSpeciesIdTable, - // Toxtricity + [SPECIES_TOXTRICITY_AMPED] = sToxtricityFormSpeciesIdTable, [SPECIES_TOXTRICITY_LOW_KEY] = sToxtricityFormSpeciesIdTable, - // Sinistea + [SPECIES_SINISTEA_PHONY] = sSinisteaFormSpeciesIdTable, [SPECIES_SINISTEA_ANTIQUE] = sSinisteaFormSpeciesIdTable, - // Polteageist + [SPECIES_POLTEAGEIST_PHONY] = sPolteageistFormSpeciesIdTable, [SPECIES_POLTEAGEIST_ANTIQUE] = sPolteageistFormSpeciesIdTable, - // Alcremie + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = sAlcremieFormSpeciesIdTable, [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAlcremieFormSpeciesIdTable, [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAlcremieFormSpeciesIdTable, [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAlcremieFormSpeciesIdTable, @@ -555,26 +478,27 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAlcremieFormSpeciesIdTable, [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAlcremieFormSpeciesIdTable, [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAlcremieFormSpeciesIdTable, - // Eiscue + + [SPECIES_EISCUE_ICE_FACE] = sEiscueFormSpeciesIdTable, [SPECIES_EISCUE_NOICE_FACE] = sEiscueFormSpeciesIdTable, - // Indeedee + [SPECIES_INDEEDEE_MALE] = sIndeedeeFormSpeciesIdTable, [SPECIES_INDEEDEE_FEMALE] = sIndeedeeFormSpeciesIdTable, - // Morpeko + [SPECIES_MORPEKO_FULL_BELLY] = sMorpekoFormSpeciesIdTable, [SPECIES_MORPEKO_HANGRY] = sMorpekoFormSpeciesIdTable, - // Zacian + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sZacianFormSpeciesIdTable, [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianFormSpeciesIdTable, - // Zamazenta + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaFormSpeciesIdTable, [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaFormSpeciesIdTable, - // Eternatus + [SPECIES_ETERNATUS] = sEternatusFormSpeciesIdTable, [SPECIES_ETERNATUS_ETERNAMAX] = sEternatusFormSpeciesIdTable, - // Urshifu + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = sUrshifuFormSpeciesIdTable, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = sUrshifuFormSpeciesIdTable, - // Zarude + [SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable, [SPECIES_ZARUDE_DADA] = sZarudeFormSpeciesIdTable, - // Calyrex + [SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable, [SPECIES_CALYREX_ICE_RIDER] = sCalyrexFormSpeciesIdTable, [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFormSpeciesIdTable, - // Enamorus + [SPECIES_ENAMORUS_INCARNATE] = sEnamorusFormSpeciesIdTable, [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable, #endif }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index da4504eb2a..b0e4f054f9 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -702,9 +702,9 @@ static const u16 sDarumakaFormSpeciesIdTable[] = { }; static const u16 sDarmanitanFormSpeciesIdTable[] = { - SPECIES_DARMANITAN, + SPECIES_DARMANITAN_STANDARD_MODE, SPECIES_DARMANITAN_ZEN_MODE, - SPECIES_DARMANITAN_GALARIAN, + SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE, SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, FORM_SPECIES_END, }; @@ -728,7 +728,7 @@ static const u16 sZoroarkFormSpeciesIdTable[] = { }; static const u16 sDeerlingFormSpeciesIdTable[] = { - SPECIES_DEERLING, + SPECIES_DEERLING_SPRING, SPECIES_DEERLING_SUMMER, SPECIES_DEERLING_AUTUMN, SPECIES_DEERLING_WINTER, @@ -736,7 +736,7 @@ static const u16 sDeerlingFormSpeciesIdTable[] = { }; static const u16 sSawsbuckFormSpeciesIdTable[] = { - SPECIES_SAWSBUCK, + SPECIES_SAWSBUCK_SPRING, SPECIES_SAWSBUCK_SUMMER, SPECIES_SAWSBUCK_AUTUMN, SPECIES_SAWSBUCK_WINTER, @@ -756,19 +756,19 @@ static const u16 sBraviaryFormSpeciesIdTable[] = { }; static const u16 sTornadusFormSpeciesIdTable[] = { - SPECIES_TORNADUS, + SPECIES_TORNADUS_INCARNATE, SPECIES_TORNADUS_THERIAN, FORM_SPECIES_END, }; static const u16 sThundurusFormSpeciesIdTable[] = { - SPECIES_THUNDURUS, + SPECIES_THUNDURUS_INCARNATE, SPECIES_THUNDURUS_THERIAN, FORM_SPECIES_END, }; static const u16 sLandorusFormSpeciesIdTable[] = { - SPECIES_LANDORUS, + SPECIES_LANDORUS_INCARNATE, SPECIES_LANDORUS_THERIAN, FORM_SPECIES_END, }; @@ -781,13 +781,13 @@ static const u16 sKyuremFormSpeciesIdTable[] = { }; static const u16 sKeldeoFormSpeciesIdTable[] = { - SPECIES_KELDEO, + SPECIES_KELDEO_ORDINARY, SPECIES_KELDEO_RESOLUTE, FORM_SPECIES_END, }; static const u16 sMeloettaFormSpeciesIdTable[] = { - SPECIES_MELOETTA, + SPECIES_MELOETTA_ARIA, SPECIES_MELOETTA_PIROUETTE, FORM_SPECIES_END, }; @@ -811,7 +811,7 @@ static const u16 sGreninjaFormSpeciesIdTable[] = { }; static const u16 sVivillonFormSpeciesIdTable[] = { - SPECIES_VIVILLON, + SPECIES_VIVILLON_ICY_SNOW, SPECIES_VIVILLON_POLAR, SPECIES_VIVILLON_TUNDRA, SPECIES_VIVILLON_CONTINENTAL, @@ -835,7 +835,7 @@ static const u16 sVivillonFormSpeciesIdTable[] = { }; static const u16 sFlabebeFormSpeciesIdTable[] = { - SPECIES_FLABEBE, + SPECIES_FLABEBE_RED_FLOWER, SPECIES_FLABEBE_YELLOW_FLOWER, SPECIES_FLABEBE_ORANGE_FLOWER, SPECIES_FLABEBE_BLUE_FLOWER, @@ -844,7 +844,7 @@ static const u16 sFlabebeFormSpeciesIdTable[] = { }; static const u16 sFloetteFormSpeciesIdTable[] = { - SPECIES_FLOETTE, + SPECIES_FLOETTE_RED_FLOWER, SPECIES_FLOETTE_YELLOW_FLOWER, SPECIES_FLOETTE_ORANGE_FLOWER, SPECIES_FLOETTE_BLUE_FLOWER, @@ -854,7 +854,7 @@ static const u16 sFloetteFormSpeciesIdTable[] = { }; static const u16 sFlorgesFormSpeciesIdTable[] = { - SPECIES_FLORGES, + SPECIES_FLORGES_RED_FLOWER, SPECIES_FLORGES_YELLOW_FLOWER, SPECIES_FLORGES_ORANGE_FLOWER, SPECIES_FLORGES_BLUE_FLOWER, @@ -863,7 +863,7 @@ static const u16 sFlorgesFormSpeciesIdTable[] = { }; static const u16 sFurfrouFormSpeciesIdTable[] = { - SPECIES_FURFROU, + SPECIES_FURFROU_NATURAL, SPECIES_FURFROU_HEART_TRIM, SPECIES_FURFROU_STAR_TRIM, SPECIES_FURFROU_DIAMOND_TRIM, @@ -877,13 +877,13 @@ static const u16 sFurfrouFormSpeciesIdTable[] = { }; static const u16 sMeowsticFormSpeciesIdTable[] = { - SPECIES_MEOWSTIC, + SPECIES_MEOWSTIC_MALE, SPECIES_MEOWSTIC_FEMALE, FORM_SPECIES_END, }; static const u16 sAegislashFormSpeciesIdTable[] = { - SPECIES_AEGISLASH, + SPECIES_AEGISLASH_SHIELD, SPECIES_AEGISLASH_BLADE, FORM_SPECIES_END, }; @@ -901,7 +901,7 @@ static const u16 sGoodraFormSpeciesIdTable[] = { }; static const u16 sPumpkabooFormSpeciesIdTable[] = { - SPECIES_PUMPKABOO, + SPECIES_PUMPKABOO_AVERAGE, SPECIES_PUMPKABOO_SMALL, SPECIES_PUMPKABOO_LARGE, SPECIES_PUMPKABOO_SUPER, @@ -909,7 +909,7 @@ static const u16 sPumpkabooFormSpeciesIdTable[] = { }; static const u16 sGourgeistFormSpeciesIdTable[] = { - SPECIES_GOURGEIST, + SPECIES_GOURGEIST_AVERAGE, SPECIES_GOURGEIST_SMALL, SPECIES_GOURGEIST_LARGE, SPECIES_GOURGEIST_SUPER, @@ -923,13 +923,13 @@ static const u16 sAvaluggFormSpeciesIdTable[] = { }; static const u16 sXerneasFormSpeciesIdTable[] = { - SPECIES_XERNEAS, + SPECIES_XERNEAS_NEUTRAL, SPECIES_XERNEAS_ACTIVE, FORM_SPECIES_END, }; static const u16 sZygardeFormSpeciesIdTable[] = { - SPECIES_ZYGARDE, + SPECIES_ZYGARDE_50, SPECIES_ZYGARDE_10, SPECIES_ZYGARDE_10_POWER_CONSTRUCT, SPECIES_ZYGARDE_50_POWER_CONSTRUCT, @@ -944,7 +944,7 @@ static const u16 sDiancieFormSpeciesIdTable[] = { }; static const u16 sHoopaFormSpeciesIdTable[] = { - SPECIES_HOOPA, + SPECIES_HOOPA_CONFINED, SPECIES_HOOPA_UNBOUND, FORM_SPECIES_END, }; @@ -958,7 +958,7 @@ static const u16 sDecidueyeFormSpeciesIdTable[] = { }; static const u16 sOricorioFormSpeciesIdTable[] = { - SPECIES_ORICORIO, + SPECIES_ORICORIO_BAILE, SPECIES_ORICORIO_POM_POM, SPECIES_ORICORIO_PAU, SPECIES_ORICORIO_SENSU, @@ -972,20 +972,20 @@ static const u16 sRockruffFormSpeciesIdTable[] = { }; static const u16 sLycanrocFormSpeciesIdTable[] = { - SPECIES_LYCANROC, + SPECIES_LYCANROC_MIDDAY, SPECIES_LYCANROC_MIDNIGHT, SPECIES_LYCANROC_DUSK, FORM_SPECIES_END, }; static const u16 sWishiwashiFormSpeciesIdTable[] = { - SPECIES_WISHIWASHI, + SPECIES_WISHIWASHI_SOLO, SPECIES_WISHIWASHI_SCHOOL, FORM_SPECIES_END, }; static const u16 sSilvallyFormSpeciesIdTable[] = { - SPECIES_SILVALLY, + SPECIES_SILVALLY_NORMAL, SPECIES_SILVALLY_FIGHTING, SPECIES_SILVALLY_FLYING, SPECIES_SILVALLY_POISON, @@ -1007,7 +1007,7 @@ static const u16 sSilvallyFormSpeciesIdTable[] = { }; static const u16 sMiniorFormSpeciesIdTable[] = { - SPECIES_MINIOR, + SPECIES_MINIOR_METEOR_RED, SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_METEOR_GREEN, @@ -1025,7 +1025,7 @@ static const u16 sMiniorFormSpeciesIdTable[] = { }; static const u16 sMimikyuFormSpeciesIdTable[] = { - SPECIES_MIMIKYU, + SPECIES_MIMIKYU_DISGUISED, SPECIES_MIMIKYU_BUSTED, FORM_SPECIES_END, }; @@ -1054,25 +1054,25 @@ static const u16 sCramorantFormSpeciesIdTable[] = { }; static const u16 sToxtricityFormSpeciesIdTable[] = { - SPECIES_TOXTRICITY, + SPECIES_TOXTRICITY_AMPED, SPECIES_TOXTRICITY_LOW_KEY, FORM_SPECIES_END, }; static const u16 sSinisteaFormSpeciesIdTable[] = { - SPECIES_SINISTEA, + SPECIES_SINISTEA_PHONY, SPECIES_SINISTEA_ANTIQUE, FORM_SPECIES_END, }; static const u16 sPolteageistFormSpeciesIdTable[] = { - SPECIES_POLTEAGEIST, + SPECIES_POLTEAGEIST_PHONY, SPECIES_POLTEAGEIST_ANTIQUE, FORM_SPECIES_END, }; static const u16 sAlcremieFormSpeciesIdTable[] = { - SPECIES_ALCREMIE, + SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM, SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM, SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM, SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM, @@ -1085,31 +1085,31 @@ static const u16 sAlcremieFormSpeciesIdTable[] = { }; static const u16 sEiscueFormSpeciesIdTable[] = { - SPECIES_EISCUE, + SPECIES_EISCUE_ICE_FACE, SPECIES_EISCUE_NOICE_FACE, FORM_SPECIES_END, }; static const u16 sIndeedeeFormSpeciesIdTable[] = { - SPECIES_INDEEDEE, + SPECIES_INDEEDEE_MALE, SPECIES_INDEEDEE_FEMALE, FORM_SPECIES_END, }; static const u16 sMorpekoFormSpeciesIdTable[] = { - SPECIES_MORPEKO, + SPECIES_MORPEKO_FULL_BELLY, SPECIES_MORPEKO_HANGRY, FORM_SPECIES_END, }; static const u16 sZacianFormSpeciesIdTable[] = { - SPECIES_ZACIAN, + SPECIES_ZACIAN_HERO_OF_MANY_BATTLES, SPECIES_ZACIAN_CROWNED_SWORD, FORM_SPECIES_END, }; static const u16 sZamazentaFormSpeciesIdTable[] = { - SPECIES_ZAMAZENTA, + SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES, SPECIES_ZAMAZENTA_CROWNED_SHIELD, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 6f57819805..63e02127a7 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -4,31 +4,56 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BULBASAUR] = sBulbasaurLevelUpLearnset, [SPECIES_IVYSAUR] = sIvysaurLevelUpLearnset, [SPECIES_VENUSAUR] = sVenusaurLevelUpLearnset, + [SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset, [SPECIES_CHARMANDER] = sCharmanderLevelUpLearnset, [SPECIES_CHARMELEON] = sCharmeleonLevelUpLearnset, [SPECIES_CHARIZARD] = sCharizardLevelUpLearnset, + [SPECIES_CHARIZARD_MEGA_X] = sCharizardLevelUpLearnset, + [SPECIES_CHARIZARD_MEGA_Y] = sCharizardLevelUpLearnset, [SPECIES_SQUIRTLE] = sSquirtleLevelUpLearnset, [SPECIES_WARTORTLE] = sWartortleLevelUpLearnset, [SPECIES_BLASTOISE] = sBlastoiseLevelUpLearnset, + [SPECIES_BLASTOISE_MEGA] = sBlastoiseLevelUpLearnset, [SPECIES_CATERPIE] = sCaterpieLevelUpLearnset, [SPECIES_METAPOD] = sMetapodLevelUpLearnset, [SPECIES_BUTTERFREE] = sButterfreeLevelUpLearnset, [SPECIES_WEEDLE] = sWeedleLevelUpLearnset, [SPECIES_KAKUNA] = sKakunaLevelUpLearnset, [SPECIES_BEEDRILL] = sBeedrillLevelUpLearnset, + [SPECIES_BEEDRILL_MEGA] = sBeedrillLevelUpLearnset, [SPECIES_PIDGEY] = sPidgeyLevelUpLearnset, [SPECIES_PIDGEOTTO] = sPidgeottoLevelUpLearnset, [SPECIES_PIDGEOT] = sPidgeotLevelUpLearnset, + [SPECIES_PIDGEOT_MEGA] = sPidgeotLevelUpLearnset, [SPECIES_RATTATA] = sRattataLevelUpLearnset, + [SPECIES_RATTATA_ALOLAN] = sRattataAlolanLevelUpLearnset, [SPECIES_RATICATE] = sRaticateLevelUpLearnset, + [SPECIES_RATICATE_ALOLAN] = sRaticateAlolanLevelUpLearnset, [SPECIES_SPEAROW] = sSpearowLevelUpLearnset, [SPECIES_FEAROW] = sFearowLevelUpLearnset, [SPECIES_EKANS] = sEkansLevelUpLearnset, [SPECIES_ARBOK] = sArbokLevelUpLearnset, [SPECIES_PIKACHU] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_ROCK_STAR] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_BELLE] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_POP_STAR] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_PH_D] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_LIBRE] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_ORIGINAL_CAP] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_HOENN_CAP] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_SINNOH_CAP] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_UNOVA_CAP] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_KALOS_CAP] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_ALOLA_CAP] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_PARTNER_CAP] = sPikachuLevelUpLearnset, + [SPECIES_PIKACHU_WORLD_CAP] = sPikachuLevelUpLearnset, [SPECIES_RAICHU] = sRaichuLevelUpLearnset, + [SPECIES_RAICHU_ALOLAN] = sRaichuAlolanLevelUpLearnset, [SPECIES_SANDSHREW] = sSandshrewLevelUpLearnset, + [SPECIES_SANDSHREW_ALOLAN] = sSandshrewAlolanLevelUpLearnset, [SPECIES_SANDSLASH] = sSandslashLevelUpLearnset, + [SPECIES_SANDSLASH_ALOLAN] = sSandslashAlolanLevelUpLearnset, [SPECIES_NIDORAN_F] = sNidoranFLevelUpLearnset, [SPECIES_NIDORINA] = sNidorinaLevelUpLearnset, [SPECIES_NIDOQUEEN] = sNidoqueenLevelUpLearnset, @@ -38,7 +63,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CLEFAIRY] = sClefairyLevelUpLearnset, [SPECIES_CLEFABLE] = sClefableLevelUpLearnset, [SPECIES_VULPIX] = sVulpixLevelUpLearnset, + [SPECIES_VULPIX_ALOLAN] = sVulpixAlolanLevelUpLearnset, [SPECIES_NINETALES] = sNinetalesLevelUpLearnset, + [SPECIES_NINETALES_ALOLAN] = sNinetalesAlolanLevelUpLearnset, [SPECIES_JIGGLYPUFF] = sJigglypuffLevelUpLearnset, [SPECIES_WIGGLYTUFF] = sWigglytuffLevelUpLearnset, [SPECIES_ZUBAT] = sZubatLevelUpLearnset, @@ -51,21 +78,29 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_VENONAT] = sVenonatLevelUpLearnset, [SPECIES_VENOMOTH] = sVenomothLevelUpLearnset, [SPECIES_DIGLETT] = sDiglettLevelUpLearnset, + [SPECIES_DIGLETT_ALOLAN] = sDiglettAlolanLevelUpLearnset, [SPECIES_DUGTRIO] = sDugtrioLevelUpLearnset, + [SPECIES_DUGTRIO_ALOLAN] = sDugtrioAlolanLevelUpLearnset, [SPECIES_MEOWTH] = sMeowthLevelUpLearnset, + [SPECIES_MEOWTH_ALOLAN] = sMeowthAlolanLevelUpLearnset, + [SPECIES_MEOWTH_GALARIAN] = sMeowthGalarianLevelUpLearnset, [SPECIES_PERSIAN] = sPersianLevelUpLearnset, + [SPECIES_PERSIAN_ALOLAN] = sPersianAlolanLevelUpLearnset, [SPECIES_PSYDUCK] = sPsyduckLevelUpLearnset, [SPECIES_GOLDUCK] = sGolduckLevelUpLearnset, [SPECIES_MANKEY] = sMankeyLevelUpLearnset, [SPECIES_PRIMEAPE] = sPrimeapeLevelUpLearnset, [SPECIES_GROWLITHE] = sGrowlitheLevelUpLearnset, + [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianLevelUpLearnset, [SPECIES_ARCANINE] = sArcanineLevelUpLearnset, + [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianLevelUpLearnset, [SPECIES_POLIWAG] = sPoliwagLevelUpLearnset, [SPECIES_POLIWHIRL] = sPoliwhirlLevelUpLearnset, [SPECIES_POLIWRATH] = sPoliwrathLevelUpLearnset, [SPECIES_ABRA] = sAbraLevelUpLearnset, [SPECIES_KADABRA] = sKadabraLevelUpLearnset, [SPECIES_ALAKAZAM] = sAlakazamLevelUpLearnset, + [SPECIES_ALAKAZAM_MEGA] = sAlakazamLevelUpLearnset, [SPECIES_MACHOP] = sMachopLevelUpLearnset, [SPECIES_MACHOKE] = sMachokeLevelUpLearnset, [SPECIES_MACHAMP] = sMachampLevelUpLearnset, @@ -75,47 +110,65 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_TENTACOOL] = sTentacoolLevelUpLearnset, [SPECIES_TENTACRUEL] = sTentacruelLevelUpLearnset, [SPECIES_GEODUDE] = sGeodudeLevelUpLearnset, + [SPECIES_GEODUDE_ALOLAN] = sGeodudeAlolanLevelUpLearnset, [SPECIES_GRAVELER] = sGravelerLevelUpLearnset, + [SPECIES_GRAVELER_ALOLAN] = sGravelerAlolanLevelUpLearnset, [SPECIES_GOLEM] = sGolemLevelUpLearnset, + [SPECIES_GOLEM_ALOLAN] = sGolemAlolanLevelUpLearnset, [SPECIES_PONYTA] = sPonytaLevelUpLearnset, + [SPECIES_PONYTA_GALARIAN] = sPonytaGalarianLevelUpLearnset, [SPECIES_RAPIDASH] = sRapidashLevelUpLearnset, + [SPECIES_RAPIDASH_GALARIAN] = sRapidashGalarianLevelUpLearnset, [SPECIES_SLOWPOKE] = sSlowpokeLevelUpLearnset, + [SPECIES_SLOWPOKE_GALARIAN] = sSlowpokeGalarianLevelUpLearnset, [SPECIES_SLOWBRO] = sSlowbroLevelUpLearnset, + [SPECIES_SLOWBRO_GALARIAN] = sSlowbroGalarianLevelUpLearnset, + [SPECIES_SLOWBRO_MEGA] = sSlowbroLevelUpLearnset, [SPECIES_MAGNEMITE] = sMagnemiteLevelUpLearnset, [SPECIES_MAGNETON] = sMagnetonLevelUpLearnset, [SPECIES_FARFETCHD] = sFarfetchdLevelUpLearnset, + [SPECIES_FARFETCHD_GALARIAN] = sFarfetchdGalarianLevelUpLearnset, [SPECIES_DODUO] = sDoduoLevelUpLearnset, [SPECIES_DODRIO] = sDodrioLevelUpLearnset, [SPECIES_SEEL] = sSeelLevelUpLearnset, [SPECIES_DEWGONG] = sDewgongLevelUpLearnset, [SPECIES_GRIMER] = sGrimerLevelUpLearnset, + [SPECIES_GRIMER_ALOLAN] = sGrimerAlolanLevelUpLearnset, [SPECIES_MUK] = sMukLevelUpLearnset, + [SPECIES_MUK_ALOLAN] = sMukAlolanLevelUpLearnset, [SPECIES_SHELLDER] = sShellderLevelUpLearnset, [SPECIES_CLOYSTER] = sCloysterLevelUpLearnset, [SPECIES_GASTLY] = sGastlyLevelUpLearnset, [SPECIES_HAUNTER] = sHaunterLevelUpLearnset, [SPECIES_GENGAR] = sGengarLevelUpLearnset, + [SPECIES_GENGAR_MEGA] = sGengarLevelUpLearnset, [SPECIES_ONIX] = sOnixLevelUpLearnset, [SPECIES_DROWZEE] = sDrowzeeLevelUpLearnset, [SPECIES_HYPNO] = sHypnoLevelUpLearnset, [SPECIES_KRABBY] = sKrabbyLevelUpLearnset, [SPECIES_KINGLER] = sKinglerLevelUpLearnset, [SPECIES_VOLTORB] = sVoltorbLevelUpLearnset, + [SPECIES_VOLTORB_HISUIAN] = sVoltorbHisuianLevelUpLearnset, [SPECIES_ELECTRODE] = sElectrodeLevelUpLearnset, + [SPECIES_ELECTRODE_HISUIAN] = sElectrodeHisuianLevelUpLearnset, [SPECIES_EXEGGCUTE] = sExeggcuteLevelUpLearnset, [SPECIES_EXEGGUTOR] = sExeggutorLevelUpLearnset, + [SPECIES_EXEGGUTOR_ALOLAN] = sExeggutorAlolanLevelUpLearnset, [SPECIES_CUBONE] = sCuboneLevelUpLearnset, [SPECIES_MAROWAK] = sMarowakLevelUpLearnset, + [SPECIES_MAROWAK_ALOLAN] = sMarowakAlolanLevelUpLearnset, [SPECIES_HITMONLEE] = sHitmonleeLevelUpLearnset, [SPECIES_HITMONCHAN] = sHitmonchanLevelUpLearnset, [SPECIES_LICKITUNG] = sLickitungLevelUpLearnset, [SPECIES_KOFFING] = sKoffingLevelUpLearnset, [SPECIES_WEEZING] = sWeezingLevelUpLearnset, + [SPECIES_WEEZING_GALARIAN] = sWeezingGalarianLevelUpLearnset, [SPECIES_RHYHORN] = sRhyhornLevelUpLearnset, [SPECIES_RHYDON] = sRhydonLevelUpLearnset, [SPECIES_CHANSEY] = sChanseyLevelUpLearnset, [SPECIES_TANGELA] = sTangelaLevelUpLearnset, [SPECIES_KANGASKHAN] = sKangaskhanLevelUpLearnset, + [SPECIES_KANGASKHAN_MEGA] = sKangaskhanLevelUpLearnset, [SPECIES_HORSEA] = sHorseaLevelUpLearnset, [SPECIES_SEADRA] = sSeadraLevelUpLearnset, [SPECIES_GOLDEEN] = sGoldeenLevelUpLearnset, @@ -123,14 +176,17 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_STARYU] = sStaryuLevelUpLearnset, [SPECIES_STARMIE] = sStarmieLevelUpLearnset, [SPECIES_MR_MIME] = sMrMimeLevelUpLearnset, + [SPECIES_MR_MIME_GALARIAN] = sMrMimeGalarianLevelUpLearnset, [SPECIES_SCYTHER] = sScytherLevelUpLearnset, [SPECIES_JYNX] = sJynxLevelUpLearnset, [SPECIES_ELECTABUZZ] = sElectabuzzLevelUpLearnset, [SPECIES_MAGMAR] = sMagmarLevelUpLearnset, [SPECIES_PINSIR] = sPinsirLevelUpLearnset, + [SPECIES_PINSIR_MEGA] = sPinsirLevelUpLearnset, [SPECIES_TAUROS] = sTaurosLevelUpLearnset, [SPECIES_MAGIKARP] = sMagikarpLevelUpLearnset, [SPECIES_GYARADOS] = sGyaradosLevelUpLearnset, + [SPECIES_GYARADOS_MEGA] = sGyaradosLevelUpLearnset, [SPECIES_LAPRAS] = sLaprasLevelUpLearnset, [SPECIES_DITTO] = sDittoLevelUpLearnset, [SPECIES_EEVEE] = sEeveeLevelUpLearnset, @@ -143,14 +199,20 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_KABUTO] = sKabutoLevelUpLearnset, [SPECIES_KABUTOPS] = sKabutopsLevelUpLearnset, [SPECIES_AERODACTYL] = sAerodactylLevelUpLearnset, + [SPECIES_AERODACTYL_MEGA] = sAerodactylLevelUpLearnset, [SPECIES_SNORLAX] = sSnorlaxLevelUpLearnset, [SPECIES_ARTICUNO] = sArticunoLevelUpLearnset, + [SPECIES_ARTICUNO_GALARIAN] = sArticunoGalarianLevelUpLearnset, [SPECIES_ZAPDOS] = sZapdosLevelUpLearnset, + [SPECIES_ZAPDOS_GALARIAN] = sZapdosGalarianLevelUpLearnset, [SPECIES_MOLTRES] = sMoltresLevelUpLearnset, + [SPECIES_MOLTRES_GALARIAN] = sMoltresGalarianLevelUpLearnset, [SPECIES_DRATINI] = sDratiniLevelUpLearnset, [SPECIES_DRAGONAIR] = sDragonairLevelUpLearnset, [SPECIES_DRAGONITE] = sDragoniteLevelUpLearnset, [SPECIES_MEWTWO] = sMewtwoLevelUpLearnset, + [SPECIES_MEWTWO_MEGA_X] = sMewtwoLevelUpLearnset, + [SPECIES_MEWTWO_MEGA_Y] = sMewtwoLevelUpLearnset, [SPECIES_MEW] = sMewLevelUpLearnset, [SPECIES_CHIKORITA] = sChikoritaLevelUpLearnset, [SPECIES_BAYLEEF] = sBayleefLevelUpLearnset, @@ -158,6 +220,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CYNDAQUIL] = sCyndaquilLevelUpLearnset, [SPECIES_QUILAVA] = sQuilavaLevelUpLearnset, [SPECIES_TYPHLOSION] = sTyphlosionLevelUpLearnset, + [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianLevelUpLearnset, [SPECIES_TOTODILE] = sTotodileLevelUpLearnset, [SPECIES_CROCONAW] = sCroconawLevelUpLearnset, [SPECIES_FERALIGATR] = sFeraligatrLevelUpLearnset, @@ -173,6 +236,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CHINCHOU] = sChinchouLevelUpLearnset, [SPECIES_LANTURN] = sLanturnLevelUpLearnset, [SPECIES_PICHU] = sPichuLevelUpLearnset, + [SPECIES_PICHU_SPIKY_EARED] = sPichuLevelUpLearnset, [SPECIES_CLEFFA] = sCleffaLevelUpLearnset, [SPECIES_IGGLYBUFF] = sIgglybuffLevelUpLearnset, [SPECIES_TOGEPI] = sTogepiLevelUpLearnset, @@ -182,6 +246,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MAREEP] = sMareepLevelUpLearnset, [SPECIES_FLAAFFY] = sFlaaffyLevelUpLearnset, [SPECIES_AMPHAROS] = sAmpharosLevelUpLearnset, + [SPECIES_AMPHAROS_MEGA] = sAmpharosLevelUpLearnset, [SPECIES_BELLOSSOM] = sBellossomLevelUpLearnset, [SPECIES_MARILL] = sMarillLevelUpLearnset, [SPECIES_AZUMARILL] = sAzumarillLevelUpLearnset, @@ -200,6 +265,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_UMBREON] = sUmbreonLevelUpLearnset, [SPECIES_MURKROW] = sMurkrowLevelUpLearnset, [SPECIES_SLOWKING] = sSlowkingLevelUpLearnset, + [SPECIES_SLOWKING_GALARIAN] = sSlowkingGalarianLevelUpLearnset, [SPECIES_MISDREAVUS] = sMisdreavusLevelUpLearnset, [SPECIES_UNOWN] = sUnownLevelUpLearnset, [SPECIES_UNOWN_B] = sUnownLevelUpLearnset, @@ -236,13 +302,18 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DUNSPARCE] = sDunsparceLevelUpLearnset, [SPECIES_GLIGAR] = sGligarLevelUpLearnset, [SPECIES_STEELIX] = sSteelixLevelUpLearnset, + [SPECIES_STEELIX_MEGA] = sSteelixLevelUpLearnset, [SPECIES_SNUBBULL] = sSnubbullLevelUpLearnset, [SPECIES_GRANBULL] = sGranbullLevelUpLearnset, [SPECIES_QWILFISH] = sQwilfishLevelUpLearnset, + [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianLevelUpLearnset, [SPECIES_SCIZOR] = sScizorLevelUpLearnset, + [SPECIES_SCIZOR_MEGA] = sScizorLevelUpLearnset, [SPECIES_SHUCKLE] = sShuckleLevelUpLearnset, [SPECIES_HERACROSS] = sHeracrossLevelUpLearnset, + [SPECIES_HERACROSS_MEGA] = sHeracrossLevelUpLearnset, [SPECIES_SNEASEL] = sSneaselLevelUpLearnset, + [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianLevelUpLearnset, [SPECIES_TEDDIURSA] = sTeddiursaLevelUpLearnset, [SPECIES_URSARING] = sUrsaringLevelUpLearnset, [SPECIES_SLUGMA] = sSlugmaLevelUpLearnset, @@ -250,6 +321,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SWINUB] = sSwinubLevelUpLearnset, [SPECIES_PILOSWINE] = sPiloswineLevelUpLearnset, [SPECIES_CORSOLA] = sCorsolaLevelUpLearnset, + [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianLevelUpLearnset, [SPECIES_REMORAID] = sRemoraidLevelUpLearnset, [SPECIES_OCTILLERY] = sOctilleryLevelUpLearnset, [SPECIES_DELIBIRD] = sDelibirdLevelUpLearnset, @@ -257,6 +329,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SKARMORY] = sSkarmoryLevelUpLearnset, [SPECIES_HOUNDOUR] = sHoundourLevelUpLearnset, [SPECIES_HOUNDOOM] = sHoundoomLevelUpLearnset, + [SPECIES_HOUNDOOM_MEGA] = sHoundoomLevelUpLearnset, [SPECIES_KINGDRA] = sKingdraLevelUpLearnset, [SPECIES_PHANPY] = sPhanpyLevelUpLearnset, [SPECIES_DONPHAN] = sDonphanLevelUpLearnset, @@ -276,22 +349,28 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_LARVITAR] = sLarvitarLevelUpLearnset, [SPECIES_PUPITAR] = sPupitarLevelUpLearnset, [SPECIES_TYRANITAR] = sTyranitarLevelUpLearnset, + [SPECIES_TYRANITAR_MEGA] = sTyranitarLevelUpLearnset, [SPECIES_LUGIA] = sLugiaLevelUpLearnset, [SPECIES_HO_OH] = sHoOhLevelUpLearnset, [SPECIES_CELEBI] = sCelebiLevelUpLearnset, [SPECIES_TREECKO] = sTreeckoLevelUpLearnset, [SPECIES_GROVYLE] = sGrovyleLevelUpLearnset, [SPECIES_SCEPTILE] = sSceptileLevelUpLearnset, + [SPECIES_SCEPTILE_MEGA] = sSceptileLevelUpLearnset, [SPECIES_TORCHIC] = sTorchicLevelUpLearnset, [SPECIES_COMBUSKEN] = sCombuskenLevelUpLearnset, [SPECIES_BLAZIKEN] = sBlazikenLevelUpLearnset, + [SPECIES_BLAZIKEN_MEGA] = sBlazikenLevelUpLearnset, [SPECIES_MUDKIP] = sMudkipLevelUpLearnset, [SPECIES_MARSHTOMP] = sMarshtompLevelUpLearnset, [SPECIES_SWAMPERT] = sSwampertLevelUpLearnset, + [SPECIES_SWAMPERT_MEGA] = sSwampertLevelUpLearnset, [SPECIES_POOCHYENA] = sPoochyenaLevelUpLearnset, [SPECIES_MIGHTYENA] = sMightyenaLevelUpLearnset, [SPECIES_ZIGZAGOON] = sZigzagoonLevelUpLearnset, + [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianLevelUpLearnset, [SPECIES_LINOONE] = sLinooneLevelUpLearnset, + [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianLevelUpLearnset, [SPECIES_WURMPLE] = sWurmpleLevelUpLearnset, [SPECIES_SILCOON] = sSilcoonLevelUpLearnset, [SPECIES_BEAUTIFLY] = sBeautiflyLevelUpLearnset, @@ -310,6 +389,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_RALTS] = sRaltsLevelUpLearnset, [SPECIES_KIRLIA] = sKirliaLevelUpLearnset, [SPECIES_GARDEVOIR] = sGardevoirLevelUpLearnset, + [SPECIES_GARDEVOIR_MEGA] = sGardevoirLevelUpLearnset, [SPECIES_SURSKIT] = sSurskitLevelUpLearnset, [SPECIES_MASQUERAIN] = sMasquerainLevelUpLearnset, [SPECIES_SHROOMISH] = sShroomishLevelUpLearnset, @@ -330,14 +410,19 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SKITTY] = sSkittyLevelUpLearnset, [SPECIES_DELCATTY] = sDelcattyLevelUpLearnset, [SPECIES_SABLEYE] = sSableyeLevelUpLearnset, + [SPECIES_SABLEYE_MEGA] = sSableyeLevelUpLearnset, [SPECIES_MAWILE] = sMawileLevelUpLearnset, + [SPECIES_MAWILE_MEGA] = sMawileLevelUpLearnset, [SPECIES_ARON] = sAronLevelUpLearnset, [SPECIES_LAIRON] = sLaironLevelUpLearnset, [SPECIES_AGGRON] = sAggronLevelUpLearnset, + [SPECIES_AGGRON_MEGA] = sAggronLevelUpLearnset, [SPECIES_MEDITITE] = sMedititeLevelUpLearnset, [SPECIES_MEDICHAM] = sMedichamLevelUpLearnset, + [SPECIES_MEDICHAM_MEGA] = sMedichamLevelUpLearnset, [SPECIES_ELECTRIKE] = sElectrikeLevelUpLearnset, [SPECIES_MANECTRIC] = sManectricLevelUpLearnset, + [SPECIES_MANECTRIC_MEGA] = sManectricLevelUpLearnset, [SPECIES_PLUSLE] = sPlusleLevelUpLearnset, [SPECIES_MINUN] = sMinunLevelUpLearnset, [SPECIES_VOLBEAT] = sVolbeatLevelUpLearnset, @@ -347,10 +432,12 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SWALOT] = sSwalotLevelUpLearnset, [SPECIES_CARVANHA] = sCarvanhaLevelUpLearnset, [SPECIES_SHARPEDO] = sSharpedoLevelUpLearnset, + [SPECIES_SHARPEDO_MEGA] = sSharpedoLevelUpLearnset, [SPECIES_WAILMER] = sWailmerLevelUpLearnset, [SPECIES_WAILORD] = sWailordLevelUpLearnset, [SPECIES_NUMEL] = sNumelLevelUpLearnset, [SPECIES_CAMERUPT] = sCameruptLevelUpLearnset, + [SPECIES_CAMERUPT_MEGA] = sCameruptLevelUpLearnset, [SPECIES_TORKOAL] = sTorkoalLevelUpLearnset, [SPECIES_SPOINK] = sSpoinkLevelUpLearnset, [SPECIES_GRUMPIG] = sGrumpigLevelUpLearnset, @@ -362,6 +449,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CACTURNE] = sCacturneLevelUpLearnset, [SPECIES_SWABLU] = sSwabluLevelUpLearnset, [SPECIES_ALTARIA] = sAltariaLevelUpLearnset, + [SPECIES_ALTARIA_MEGA] = sAltariaLevelUpLearnset, [SPECIES_ZANGOOSE] = sZangooseLevelUpLearnset, [SPECIES_SEVIPER] = sSeviperLevelUpLearnset, [SPECIES_LUNATONE] = sLunatoneLevelUpLearnset, @@ -385,14 +473,17 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_KECLEON] = sKecleonLevelUpLearnset, [SPECIES_SHUPPET] = sShuppetLevelUpLearnset, [SPECIES_BANETTE] = sBanetteLevelUpLearnset, + [SPECIES_BANETTE_MEGA] = sBanetteLevelUpLearnset, [SPECIES_DUSKULL] = sDuskullLevelUpLearnset, [SPECIES_DUSCLOPS] = sDusclopsLevelUpLearnset, [SPECIES_TROPIUS] = sTropiusLevelUpLearnset, [SPECIES_CHIMECHO] = sChimechoLevelUpLearnset, [SPECIES_ABSOL] = sAbsolLevelUpLearnset, + [SPECIES_ABSOL_MEGA] = sAbsolLevelUpLearnset, [SPECIES_WYNAUT] = sWynautLevelUpLearnset, [SPECIES_SNORUNT] = sSnoruntLevelUpLearnset, [SPECIES_GLALIE] = sGlalieLevelUpLearnset, + [SPECIES_GLALIE_MEGA] = sGlalieLevelUpLearnset, [SPECIES_SPHEAL] = sSphealLevelUpLearnset, [SPECIES_SEALEO] = sSealeoLevelUpLearnset, [SPECIES_WALREIN] = sWalreinLevelUpLearnset, @@ -404,17 +495,24 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BAGON] = sBagonLevelUpLearnset, [SPECIES_SHELGON] = sShelgonLevelUpLearnset, [SPECIES_SALAMENCE] = sSalamenceLevelUpLearnset, + [SPECIES_SALAMENCE_MEGA] = sSalamenceLevelUpLearnset, [SPECIES_BELDUM] = sBeldumLevelUpLearnset, [SPECIES_METANG] = sMetangLevelUpLearnset, [SPECIES_METAGROSS] = sMetagrossLevelUpLearnset, + [SPECIES_METAGROSS_MEGA] = sMetagrossLevelUpLearnset, [SPECIES_REGIROCK] = sRegirockLevelUpLearnset, [SPECIES_REGICE] = sRegiceLevelUpLearnset, [SPECIES_REGISTEEL] = sRegisteelLevelUpLearnset, [SPECIES_LATIAS] = sLatiasLevelUpLearnset, + [SPECIES_LATIAS_MEGA] = sLatiasLevelUpLearnset, [SPECIES_LATIOS] = sLatiosLevelUpLearnset, + [SPECIES_LATIOS_MEGA] = sLatiosLevelUpLearnset, [SPECIES_KYOGRE] = sKyogreLevelUpLearnset, + [SPECIES_KYOGRE_PRIMAL] = sKyogreLevelUpLearnset, [SPECIES_GROUDON] = sGroudonLevelUpLearnset, + [SPECIES_GROUDON_PRIMAL] = sGroudonLevelUpLearnset, [SPECIES_RAYQUAZA] = sRayquazaLevelUpLearnset, + [SPECIES_RAYQUAZA_MEGA] = sRayquazaLevelUpLearnset, [SPECIES_JIRACHI] = sJirachiLevelUpLearnset, [SPECIES_DEOXYS_NORMAL] = sDeoxysNormalLevelUpLearnset, [SPECIES_DEOXYS_ATTACK] = sDeoxysAttackLevelUpLearnset, @@ -464,13 +562,14 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CHERRIM_SUNSHINE] = sCherrimLevelUpLearnset, [SPECIES_SHELLOS_WEST_SEA] = sShellosLevelUpLearnset, [SPECIES_SHELLOS_EAST_SEA] = sShellosLevelUpLearnset, - [SPECIES_GASTRODON] = sGastrodonLevelUpLearnset, + [SPECIES_GASTRODON_WEST_SEA] = sGastrodonLevelUpLearnset, [SPECIES_GASTRODON_EAST_SEA] = sGastrodonLevelUpLearnset, [SPECIES_AMBIPOM] = sAmbipomLevelUpLearnset, [SPECIES_DRIFLOON] = sDrifloonLevelUpLearnset, [SPECIES_DRIFBLIM] = sDrifblimLevelUpLearnset, [SPECIES_BUNEARY] = sBunearyLevelUpLearnset, [SPECIES_LOPUNNY] = sLopunnyLevelUpLearnset, + [SPECIES_LOPUNNY_MEGA] = sLopunnyLevelUpLearnset, [SPECIES_MISMAGIUS] = sMismagiusLevelUpLearnset, [SPECIES_HONCHKROW] = sHonchkrowLevelUpLearnset, [SPECIES_GLAMEOW] = sGlameowLevelUpLearnset, @@ -488,9 +587,11 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_GIBLE] = sGibleLevelUpLearnset, [SPECIES_GABITE] = sGabiteLevelUpLearnset, [SPECIES_GARCHOMP] = sGarchompLevelUpLearnset, + [SPECIES_GARCHOMP_MEGA] = sGarchompLevelUpLearnset, [SPECIES_MUNCHLAX] = sMunchlaxLevelUpLearnset, [SPECIES_RIOLU] = sRioluLevelUpLearnset, [SPECIES_LUCARIO] = sLucarioLevelUpLearnset, + [SPECIES_LUCARIO_MEGA] = sLucarioLevelUpLearnset, [SPECIES_HIPPOPOTAS] = sHippopotasLevelUpLearnset, [SPECIES_HIPPOWDON] = sHippowdonLevelUpLearnset, [SPECIES_SKORUPI] = sSkorupiLevelUpLearnset, @@ -503,6 +604,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MANTYKE] = sMantykeLevelUpLearnset, [SPECIES_SNOVER] = sSnoverLevelUpLearnset, [SPECIES_ABOMASNOW] = sAbomasnowLevelUpLearnset, + [SPECIES_ABOMASNOW_MEGA] = sAbomasnowLevelUpLearnset, [SPECIES_WEAVILE] = sWeavileLevelUpLearnset, [SPECIES_MAGNEZONE] = sMagnezoneLevelUpLearnset, [SPECIES_LICKILICKY] = sLickilickyLevelUpLearnset, @@ -518,23 +620,33 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MAMOSWINE] = sMamoswineLevelUpLearnset, [SPECIES_PORYGON_Z] = sPorygonZLevelUpLearnset, [SPECIES_GALLADE] = sGalladeLevelUpLearnset, + [SPECIES_GALLADE_MEGA] = sGalladeLevelUpLearnset, [SPECIES_PROBOPASS] = sProbopassLevelUpLearnset, [SPECIES_DUSKNOIR] = sDusknoirLevelUpLearnset, [SPECIES_FROSLASS] = sFroslassLevelUpLearnset, [SPECIES_ROTOM] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_HEAT] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_WASH] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_FROST] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_FAN] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_MOW] = sRotomLevelUpLearnset, [SPECIES_UXIE] = sUxieLevelUpLearnset, [SPECIES_MESPRIT] = sMespritLevelUpLearnset, [SPECIES_AZELF] = sAzelfLevelUpLearnset, [SPECIES_DIALGA] = sDialgaLevelUpLearnset, + [SPECIES_DIALGA_ORIGIN] = sDialgaLevelUpLearnset, [SPECIES_PALKIA] = sPalkiaLevelUpLearnset, + [SPECIES_PALKIA_ORIGIN] = sPalkiaLevelUpLearnset, [SPECIES_HEATRAN] = sHeatranLevelUpLearnset, [SPECIES_REGIGIGAS] = sRegigigasLevelUpLearnset, [SPECIES_GIRATINA_ALTERED] = sGiratinaLevelUpLearnset, + [SPECIES_GIRATINA_ORIGIN] = sGiratinaLevelUpLearnset, [SPECIES_CRESSELIA] = sCresseliaLevelUpLearnset, [SPECIES_PHIONE] = sPhioneLevelUpLearnset, [SPECIES_MANAPHY] = sManaphyLevelUpLearnset, [SPECIES_DARKRAI] = sDarkraiLevelUpLearnset, [SPECIES_SHAYMIN_LAND] = sShayminLevelUpLearnset, + [SPECIES_SHAYMIN_SKY] = sShayminSkyLevelUpLearnset, [SPECIES_ARCEUS_NORMAL] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_FIGHTING] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_FLYING] = sArceusLevelUpLearnset, @@ -552,20 +664,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ARCEUS_ICE] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_DRAGON] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_DARK] = sArceusLevelUpLearnset, -// Platinum - [SPECIES_ROTOM_HEAT] = sRotomLevelUpLearnset, - [SPECIES_ROTOM_WASH] = sRotomLevelUpLearnset, - [SPECIES_ROTOM_FROST] = sRotomLevelUpLearnset, - [SPECIES_ROTOM_FAN] = sRotomLevelUpLearnset, - [SPECIES_ROTOM_MOW] = sRotomLevelUpLearnset, - [SPECIES_GIRATINA_ORIGIN] = sGiratinaLevelUpLearnset, - [SPECIES_SHAYMIN_SKY] = sShayminSkyLevelUpLearnset, + [SPECIES_ARCEUS_FAIRY] = sArceusLevelUpLearnset, #endif -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = sPichuLevelUpLearnset, - #if P_GEN_5_POKEMON == TRUE -// Black and White [SPECIES_VICTINI] = sVictiniLevelUpLearnset, [SPECIES_SNIVY] = sSnivyLevelUpLearnset, [SPECIES_SERVINE] = sServineLevelUpLearnset, @@ -576,6 +677,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_OSHAWOTT] = sOshawottLevelUpLearnset, [SPECIES_DEWOTT] = sDewottLevelUpLearnset, [SPECIES_SAMUROTT] = sSamurottLevelUpLearnset, + [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianLevelUpLearnset, [SPECIES_PATRAT] = sPatratLevelUpLearnset, [SPECIES_WATCHOG] = sWatchogLevelUpLearnset, [SPECIES_LILLIPUP] = sLillipupLevelUpLearnset, @@ -604,6 +706,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DRILBUR] = sDrilburLevelUpLearnset, [SPECIES_EXCADRILL] = sExcadrillLevelUpLearnset, [SPECIES_AUDINO] = sAudinoLevelUpLearnset, + [SPECIES_AUDINO_MEGA] = sAudinoLevelUpLearnset, [SPECIES_TIMBURR] = sTimburrLevelUpLearnset, [SPECIES_GURDURR] = sGurdurrLevelUpLearnset, [SPECIES_CONKELDURR] = sConkeldurrLevelUpLearnset, @@ -622,14 +725,19 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_WHIMSICOTT] = sWhimsicottLevelUpLearnset, [SPECIES_PETILIL] = sPetililLevelUpLearnset, [SPECIES_LILLIGANT] = sLilligantLevelUpLearnset, + [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianLevelUpLearnset, [SPECIES_BASCULIN_RED_STRIPED] = sBasculinLevelUpLearnset, [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinLevelUpLearnset, + [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset, [SPECIES_SANDILE] = sSandileLevelUpLearnset, [SPECIES_KROKOROK] = sKrokorokLevelUpLearnset, [SPECIES_KROOKODILE] = sKrookodileLevelUpLearnset, [SPECIES_DARUMAKA] = sDarumakaLevelUpLearnset, - [SPECIES_DARMANITAN] = sDarmanitanLevelUpLearnset, + [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianLevelUpLearnset, + [SPECIES_DARMANITAN_STANDARD_MODE] = sDarmanitanLevelUpLearnset, [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanLevelUpLearnset, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = sDarmanitanGalarianLevelUpLearnset, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanGalarianLevelUpLearnset, [SPECIES_MARACTUS] = sMaractusLevelUpLearnset, [SPECIES_DWEBBLE] = sDwebbleLevelUpLearnset, [SPECIES_CRUSTLE] = sCrustleLevelUpLearnset, @@ -637,6 +745,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SCRAFTY] = sScraftyLevelUpLearnset, [SPECIES_SIGILYPH] = sSigilyphLevelUpLearnset, [SPECIES_YAMASK] = sYamaskLevelUpLearnset, + [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset, [SPECIES_COFAGRIGUS] = sCofagrigusLevelUpLearnset, [SPECIES_TIRTOUGA] = sTirtougaLevelUpLearnset, [SPECIES_CARRACOSTA] = sCarracostaLevelUpLearnset, @@ -645,7 +754,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_TRUBBISH] = sTrubbishLevelUpLearnset, [SPECIES_GARBODOR] = sGarbodorLevelUpLearnset, [SPECIES_ZORUA] = sZoruaLevelUpLearnset, + [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianLevelUpLearnset, [SPECIES_ZOROARK] = sZoroarkLevelUpLearnset, + [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianLevelUpLearnset, [SPECIES_MINCCINO] = sMinccinoLevelUpLearnset, [SPECIES_CINCCINO] = sCinccinoLevelUpLearnset, [SPECIES_GOTHITA] = sGothitaLevelUpLearnset, @@ -659,11 +770,11 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_VANILLITE] = sVanilliteLevelUpLearnset, [SPECIES_VANILLISH] = sVanillishLevelUpLearnset, [SPECIES_VANILLUXE] = sVanilluxeLevelUpLearnset, - [SPECIES_DEERLING] = sDeerlingLevelUpLearnset, + [SPECIES_DEERLING_SPRING] = sDeerlingLevelUpLearnset, [SPECIES_DEERLING_SUMMER] = sDeerlingLevelUpLearnset, [SPECIES_DEERLING_AUTUMN] = sDeerlingLevelUpLearnset, [SPECIES_DEERLING_WINTER] = sDeerlingLevelUpLearnset, - [SPECIES_SAWSBUCK] = sSawsbuckLevelUpLearnset, + [SPECIES_SAWSBUCK_SPRING] = sSawsbuckLevelUpLearnset, [SPECIES_SAWSBUCK_SUMMER] = sSawsbuckLevelUpLearnset, [SPECIES_SAWSBUCK_AUTUMN] = sSawsbuckLevelUpLearnset, [SPECIES_SAWSBUCK_WINTER] = sSawsbuckLevelUpLearnset, @@ -699,6 +810,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SHELMET] = sShelmetLevelUpLearnset, [SPECIES_ACCELGOR] = sAccelgorLevelUpLearnset, [SPECIES_STUNFISK] = sStunfiskLevelUpLearnset, + [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianLevelUpLearnset, [SPECIES_MIENFOO] = sMienfooLevelUpLearnset, [SPECIES_MIENSHAO] = sMienshaoLevelUpLearnset, [SPECIES_DRUDDIGON] = sDruddigonLevelUpLearnset, @@ -709,6 +821,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BOUFFALANT] = sBouffalantLevelUpLearnset, [SPECIES_RUFFLET] = sRuffletLevelUpLearnset, [SPECIES_BRAVIARY] = sBraviaryLevelUpLearnset, + [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianLevelUpLearnset, [SPECIES_VULLABY] = sVullabyLevelUpLearnset, [SPECIES_MANDIBUZZ] = sMandibuzzLevelUpLearnset, [SPECIES_HEATMOR] = sHeatmorLevelUpLearnset, @@ -721,30 +834,28 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_COBALION] = sCobalionLevelUpLearnset, [SPECIES_TERRAKION] = sTerrakionLevelUpLearnset, [SPECIES_VIRIZION] = sVirizionLevelUpLearnset, - [SPECIES_TORNADUS] = sTornadusLevelUpLearnset, - [SPECIES_THUNDURUS] = sThundurusLevelUpLearnset, + [SPECIES_TORNADUS_INCARNATE] = sTornadusLevelUpLearnset, + [SPECIES_TORNADUS_THERIAN] = sTornadusLevelUpLearnset, + [SPECIES_THUNDURUS_INCARNATE] = sThundurusLevelUpLearnset, + [SPECIES_THUNDURUS_THERIAN] = sThundurusLevelUpLearnset, [SPECIES_RESHIRAM] = sReshiramLevelUpLearnset, [SPECIES_ZEKROM] = sZekromLevelUpLearnset, - [SPECIES_LANDORUS] = sLandorusLevelUpLearnset, + [SPECIES_LANDORUS_INCARNATE] = sLandorusLevelUpLearnset, + [SPECIES_LANDORUS_THERIAN] = sLandorusLevelUpLearnset, [SPECIES_KYUREM] = sKyuremLevelUpLearnset, - [SPECIES_KELDEO] = sKeldeoLevelUpLearnset, - [SPECIES_MELOETTA] = sMeloettaLevelUpLearnset, + [SPECIES_KYUREM_WHITE] = sKyuremWhiteLevelUpLearnset, + [SPECIES_KYUREM_BLACK] = sKyuremBlackLevelUpLearnset, + [SPECIES_KELDEO_ORDINARY] = sKeldeoLevelUpLearnset, + [SPECIES_KELDEO_RESOLUTE] = sKeldeoLevelUpLearnset, + [SPECIES_MELOETTA_ARIA] = sMeloettaLevelUpLearnset, [SPECIES_MELOETTA_PIROUETTE] = sMeloettaLevelUpLearnset, [SPECIES_GENESECT] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_DOUSE_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectLevelUpLearnset, -// Black 2 and White 2 - [SPECIES_TORNADUS_THERIAN] = sTornadusLevelUpLearnset, - [SPECIES_THUNDURUS_THERIAN] = sThundurusLevelUpLearnset, - [SPECIES_LANDORUS_THERIAN] = sLandorusLevelUpLearnset, - [SPECIES_KYUREM_WHITE] = sKyuremWhiteLevelUpLearnset, - [SPECIES_KYUREM_BLACK] = sKyuremBlackLevelUpLearnset, - [SPECIES_KELDEO_RESOLUTE] = sKeldeoLevelUpLearnset, #endif #if P_GEN_6_POKEMON == TRUE -// X and Y [SPECIES_CHESPIN] = sChespinLevelUpLearnset, [SPECIES_QUILLADIN] = sQuilladinLevelUpLearnset, [SPECIES_CHESNAUGHT] = sChesnaughtLevelUpLearnset, @@ -754,6 +865,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_FROAKIE] = sFroakieLevelUpLearnset, [SPECIES_FROGADIER] = sFrogadierLevelUpLearnset, [SPECIES_GRENINJA] = sGreninjaLevelUpLearnset, + [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaLevelUpLearnset, + [SPECIES_GRENINJA_ASH] = sGreninjaLevelUpLearnset, [SPECIES_BUNNELBY] = sBunnelbyLevelUpLearnset, [SPECIES_DIGGERSBY] = sDiggersbyLevelUpLearnset, [SPECIES_FLETCHLING] = sFletchlingLevelUpLearnset, @@ -761,22 +874,65 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_TALONFLAME] = sTalonflameLevelUpLearnset, [SPECIES_SCATTERBUG] = sScatterbugLevelUpLearnset, [SPECIES_SPEWPA] = sSpewpaLevelUpLearnset, - [SPECIES_VIVILLON] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_ICY_SNOW] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_POLAR] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_TUNDRA] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_CONTINENTAL] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_GARDEN] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_ELEGANT] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_MEADOW] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_MODERN] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_MARINE] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_ARCHIPELAGO] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_HIGH_PLAINS] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_SANDSTORM] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_RIVER] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_MONSOON] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_SAVANNA] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_SUN] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_OCEAN] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_JUNGLE] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_FANCY] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_POKE_BALL] = sVivillonLevelUpLearnset, [SPECIES_LITLEO] = sLitleoLevelUpLearnset, [SPECIES_PYROAR] = sPyroarLevelUpLearnset, - [SPECIES_FLABEBE] = sFlabebeLevelUpLearnset, - [SPECIES_FLOETTE] = sFloetteLevelUpLearnset, - [SPECIES_FLORGES] = sFlorgesLevelUpLearnset, + [SPECIES_FLABEBE_RED_FLOWER] = sFlabebeLevelUpLearnset, + [SPECIES_FLABEBE_YELLOW_FLOWER] = sFlabebeLevelUpLearnset, + [SPECIES_FLABEBE_ORANGE_FLOWER] = sFlabebeLevelUpLearnset, + [SPECIES_FLABEBE_BLUE_FLOWER] = sFlabebeLevelUpLearnset, + [SPECIES_FLABEBE_WHITE_FLOWER] = sFlabebeLevelUpLearnset, + [SPECIES_FLOETTE_RED_FLOWER] = sFloetteLevelUpLearnset, + [SPECIES_FLOETTE_YELLOW_FLOWER] = sFloetteLevelUpLearnset, + [SPECIES_FLOETTE_ORANGE_FLOWER] = sFloetteLevelUpLearnset, + [SPECIES_FLOETTE_BLUE_FLOWER] = sFloetteLevelUpLearnset, + [SPECIES_FLOETTE_WHITE_FLOWER] = sFloetteLevelUpLearnset, + [SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteEternalFlowerLevelUpLearnset, + [SPECIES_FLORGES_RED_FLOWER] = sFlorgesLevelUpLearnset, + [SPECIES_FLORGES_YELLOW_FLOWER] = sFlorgesLevelUpLearnset, + [SPECIES_FLORGES_ORANGE_FLOWER] = sFlorgesLevelUpLearnset, + [SPECIES_FLORGES_BLUE_FLOWER] = sFlorgesLevelUpLearnset, + [SPECIES_FLORGES_WHITE_FLOWER] = sFlorgesLevelUpLearnset, [SPECIES_SKIDDO] = sSkiddoLevelUpLearnset, [SPECIES_GOGOAT] = sGogoatLevelUpLearnset, [SPECIES_PANCHAM] = sPanchamLevelUpLearnset, [SPECIES_PANGORO] = sPangoroLevelUpLearnset, - [SPECIES_FURFROU] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_NATURAL] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_HEART_TRIM] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_STAR_TRIM] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_DIAMOND_TRIM] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_DEBUTANTE_TRIM] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_MATRON_TRIM] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_DANDY_TRIM] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_LA_REINE_TRIM] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_KABUKI_TRIM] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_PHARAOH_TRIM] = sFurfrouLevelUpLearnset, [SPECIES_ESPURR] = sEspurrLevelUpLearnset, - [SPECIES_MEOWSTIC] = sMeowsticLevelUpLearnset, + [SPECIES_MEOWSTIC_MALE] = sMeowsticLevelUpLearnset, + [SPECIES_MEOWSTIC_FEMALE] = sMeowsticFemaleLevelUpLearnset, [SPECIES_HONEDGE] = sHonedgeLevelUpLearnset, [SPECIES_DOUBLADE] = sDoubladeLevelUpLearnset, - [SPECIES_AEGISLASH] = sAegislashLevelUpLearnset, + [SPECIES_AEGISLASH_SHIELD] = sAegislashLevelUpLearnset, + [SPECIES_AEGISLASH_BLADE] = sAegislashLevelUpLearnset, [SPECIES_SPRITZEE] = sSpritzeeLevelUpLearnset, [SPECIES_AROMATISSE] = sAromatisseLevelUpLearnset, [SPECIES_SWIRLIX] = sSwirlixLevelUpLearnset, @@ -801,27 +957,44 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CARBINK] = sCarbinkLevelUpLearnset, [SPECIES_GOOMY] = sGoomyLevelUpLearnset, [SPECIES_SLIGGOO] = sSliggooLevelUpLearnset, + [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianLevelUpLearnset, [SPECIES_GOODRA] = sGoodraLevelUpLearnset, + [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianLevelUpLearnset, [SPECIES_KLEFKI] = sKlefkiLevelUpLearnset, [SPECIES_PHANTUMP] = sPhantumpLevelUpLearnset, [SPECIES_TREVENANT] = sTrevenantLevelUpLearnset, - [SPECIES_PUMPKABOO] = sPumpkabooLevelUpLearnset, - [SPECIES_GOURGEIST] = sGourgeistLevelUpLearnset, + [SPECIES_PUMPKABOO_AVERAGE] = sPumpkabooLevelUpLearnset, + [SPECIES_PUMPKABOO_SMALL] = sPumpkabooLevelUpLearnset, + [SPECIES_PUMPKABOO_LARGE] = sPumpkabooLevelUpLearnset, + [SPECIES_PUMPKABOO_SUPER] = sPumpkabooLevelUpLearnset, + [SPECIES_GOURGEIST_AVERAGE] = sGourgeistLevelUpLearnset, + [SPECIES_GOURGEIST_SMALL] = sGourgeistLevelUpLearnset, + [SPECIES_GOURGEIST_LARGE] = sGourgeistLevelUpLearnset, + [SPECIES_GOURGEIST_SUPER] = sGourgeistLevelUpLearnset, [SPECIES_BERGMITE] = sBergmiteLevelUpLearnset, [SPECIES_AVALUGG] = sAvaluggLevelUpLearnset, + [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianLevelUpLearnset, [SPECIES_NOIBAT] = sNoibatLevelUpLearnset, [SPECIES_NOIVERN] = sNoivernLevelUpLearnset, - [SPECIES_XERNEAS] = sXerneasLevelUpLearnset, + [SPECIES_XERNEAS_NEUTRAL] = sXerneasLevelUpLearnset, + [SPECIES_XERNEAS_ACTIVE] = sXerneasLevelUpLearnset, [SPECIES_YVELTAL] = sYveltalLevelUpLearnset, - [SPECIES_ZYGARDE] = sZygardeLevelUpLearnset, + [SPECIES_ZYGARDE_50] = sZygardeLevelUpLearnset, + [SPECIES_ZYGARDE_10] = sZygardeLevelUpLearnset, + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardeLevelUpLearnset, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardeLevelUpLearnset, + [SPECIES_ZYGARDE_COMPLETE] = sZygardeLevelUpLearnset, [SPECIES_DIANCIE] = sDiancieLevelUpLearnset, - [SPECIES_HOOPA] = sHoopaLevelUpLearnset, + [SPECIES_DIANCIE_MEGA] = sDiancieLevelUpLearnset, + [SPECIES_HOOPA_CONFINED] = sHoopaLevelUpLearnset, + [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset, [SPECIES_VOLCANION] = sVolcanionLevelUpLearnset, #endif #if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = sRowletLevelUpLearnset, [SPECIES_DARTRIX] = sDartrixLevelUpLearnset, [SPECIES_DECIDUEYE] = sDecidueyeLevelUpLearnset, + [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset, [SPECIES_LITTEN] = sLittenLevelUpLearnset, [SPECIES_TORRACAT] = sTorracatLevelUpLearnset, [SPECIES_INCINEROAR] = sIncineroarLevelUpLearnset, @@ -838,12 +1011,19 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_VIKAVOLT] = sVikavoltLevelUpLearnset, [SPECIES_CRABRAWLER] = sCrabrawlerLevelUpLearnset, [SPECIES_CRABOMINABLE] = sCrabominableLevelUpLearnset, - [SPECIES_ORICORIO] = sOricorioLevelUpLearnset, + [SPECIES_ORICORIO_BAILE] = sOricorioLevelUpLearnset, + [SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset, + [SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset, + [SPECIES_ORICORIO_SENSU] = sOricorioLevelUpLearnset, [SPECIES_CUTIEFLY] = sCutieflyLevelUpLearnset, [SPECIES_RIBOMBEE] = sRibombeeLevelUpLearnset, [SPECIES_ROCKRUFF] = sRockruffLevelUpLearnset, - [SPECIES_LYCANROC] = sLycanrocLevelUpLearnset, - [SPECIES_WISHIWASHI] = sWishiwashiLevelUpLearnset, + [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffLevelUpLearnset, + [SPECIES_LYCANROC_MIDDAY] = sLycanrocLevelUpLearnset, + [SPECIES_LYCANROC_MIDNIGHT] = sLycanrocMidnightLevelUpLearnset, + [SPECIES_LYCANROC_DUSK] = sLycanrocDuskLevelUpLearnset, + [SPECIES_WISHIWASHI_SOLO] = sWishiwashiLevelUpLearnset, + [SPECIES_WISHIWASHI_SCHOOL] = sWishiwashiLevelUpLearnset, [SPECIES_MAREANIE] = sMareanieLevelUpLearnset, [SPECIES_TOXAPEX] = sToxapexLevelUpLearnset, [SPECIES_MUDBRAY] = sMudbrayLevelUpLearnset, @@ -870,12 +1050,43 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PALOSSAND] = sPalossandLevelUpLearnset, [SPECIES_PYUKUMUKU] = sPyukumukuLevelUpLearnset, [SPECIES_TYPE_NULL] = sTypeNullLevelUpLearnset, - [SPECIES_SILVALLY] = sSilvallyLevelUpLearnset, - [SPECIES_MINIOR] = sMiniorLevelUpLearnset, + [SPECIES_SILVALLY_NORMAL] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_FIGHTING] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_FLYING] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_POISON] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_GROUND] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_ROCK] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_BUG] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_GHOST] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_STEEL] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_FIRE] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_WATER] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_GRASS] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_ELECTRIC] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_PSYCHIC] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_ICE] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_DRAGON] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_DARK] = sSilvallyLevelUpLearnset, + [SPECIES_SILVALLY_FAIRY] = sSilvallyLevelUpLearnset, + [SPECIES_MINIOR_METEOR_RED] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_METEOR_ORANGE] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_METEOR_YELLOW] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_METEOR_GREEN] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_METEOR_BLUE] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_METEOR_INDIGO] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_METEOR_VIOLET] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_CORE_RED] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_CORE_ORANGE] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_CORE_YELLOW] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_CORE_GREEN] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_CORE_BLUE] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_CORE_INDIGO] = sMiniorLevelUpLearnset, + [SPECIES_MINIOR_CORE_VIOLET] = sMiniorLevelUpLearnset, [SPECIES_KOMALA] = sKomalaLevelUpLearnset, [SPECIES_TURTONATOR] = sTurtonatorLevelUpLearnset, [SPECIES_TOGEDEMARU] = sTogedemaruLevelUpLearnset, - [SPECIES_MIMIKYU] = sMimikyuLevelUpLearnset, + [SPECIES_MIMIKYU_DISGUISED] = sMimikyuLevelUpLearnset, + [SPECIES_MIMIKYU_BUSTED] = sMimikyuLevelUpLearnset, [SPECIES_BRUXISH] = sBruxishLevelUpLearnset, [SPECIES_DRAMPA] = sDrampaLevelUpLearnset, [SPECIES_DHELMISE] = sDhelmiseLevelUpLearnset, @@ -898,7 +1109,11 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_KARTANA] = sKartanaLevelUpLearnset, [SPECIES_GUZZLORD] = sGuzzlordLevelUpLearnset, [SPECIES_NECROZMA] = sNecrozmaLevelUpLearnset, + [SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaLevelUpLearnset, + [SPECIES_NECROZMA_DAWN_WINGS] = sNecrozmaLevelUpLearnset, + [SPECIES_NECROZMA_ULTRA] = sNecrozmaLevelUpLearnset, [SPECIES_MAGEARNA] = sMagearnaLevelUpLearnset, + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaLevelUpLearnset, [SPECIES_MARSHADOW] = sMarshadowLevelUpLearnset, [SPECIES_POIPOLE] = sPoipoleLevelUpLearnset, [SPECIES_NAGANADEL] = sNaganadelLevelUpLearnset, @@ -945,16 +1160,21 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SILICOBRA] = sSilicobraLevelUpLearnset, [SPECIES_SANDACONDA] = sSandacondaLevelUpLearnset, [SPECIES_CRAMORANT] = sCramorantLevelUpLearnset, + [SPECIES_CRAMORANT_GULPING] = sCramorantLevelUpLearnset, + [SPECIES_CRAMORANT_GORGING] = sCramorantLevelUpLearnset, [SPECIES_ARROKUDA] = sArrokudaLevelUpLearnset, [SPECIES_BARRASKEWDA] = sBarraskewdaLevelUpLearnset, [SPECIES_TOXEL] = sToxelLevelUpLearnset, - [SPECIES_TOXTRICITY] = sToxtricityLevelUpLearnset, + [SPECIES_TOXTRICITY_AMPED] = sToxtricityLevelUpLearnset, + [SPECIES_TOXTRICITY_LOW_KEY] = sToxtricityLowKeyLevelUpLearnset, [SPECIES_SIZZLIPEDE] = sSizzlipedeLevelUpLearnset, [SPECIES_CENTISKORCH] = sCentiskorchLevelUpLearnset, [SPECIES_CLOBBOPUS] = sClobbopusLevelUpLearnset, [SPECIES_GRAPPLOCT] = sGrapploctLevelUpLearnset, - [SPECIES_SINISTEA] = sSinisteaLevelUpLearnset, - [SPECIES_POLTEAGEIST] = sPolteageistLevelUpLearnset, + [SPECIES_SINISTEA_PHONY] = sSinisteaLevelUpLearnset, + [SPECIES_SINISTEA_ANTIQUE] = sSinisteaLevelUpLearnset, + [SPECIES_POLTEAGEIST_PHONY] = sPolteageistLevelUpLearnset, + [SPECIES_POLTEAGEIST_ANTIQUE] = sPolteageistLevelUpLearnset, [SPECIES_HATENNA] = sHatennaLevelUpLearnset, [SPECIES_HATTREM] = sHattremLevelUpLearnset, [SPECIES_HATTERENE] = sHattereneLevelUpLearnset, @@ -968,15 +1188,27 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MR_RIME] = sMrRimeLevelUpLearnset, [SPECIES_RUNERIGUS] = sRunerigusLevelUpLearnset, [SPECIES_MILCERY] = sMilceryLevelUpLearnset, - [SPECIES_ALCREMIE] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAlcremieLevelUpLearnset, + [SPECIES_FALINKS] = sFalinksLevelUpLearnset, [SPECIES_PINCURCHIN] = sPincurchinLevelUpLearnset, [SPECIES_SNOM] = sSnomLevelUpLearnset, [SPECIES_FROSMOTH] = sFrosmothLevelUpLearnset, [SPECIES_STONJOURNER] = sStonjournerLevelUpLearnset, - [SPECIES_EISCUE] = sEiscueLevelUpLearnset, - [SPECIES_INDEEDEE] = sIndeedeeLevelUpLearnset, - [SPECIES_MORPEKO] = sMorpekoLevelUpLearnset, + [SPECIES_EISCUE_ICE_FACE] = sEiscueLevelUpLearnset, + [SPECIES_EISCUE_NOICE_FACE] = sEiscueLevelUpLearnset, + [SPECIES_INDEEDEE_MALE] = sIndeedeeLevelUpLearnset, + [SPECIES_INDEEDEE_FEMALE] = sIndeedeeFemaleLevelUpLearnset, + [SPECIES_MORPEKO_FULL_BELLY] = sMorpekoLevelUpLearnset, + [SPECIES_MORPEKO_HANGRY] = sMorpekoLevelUpLearnset, [SPECIES_CUFANT] = sCufantLevelUpLearnset, [SPECIES_COPPERAJAH] = sCopperajahLevelUpLearnset, [SPECIES_DRACOZOLT] = sDracozoltLevelUpLearnset, @@ -987,342 +1219,31 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DREEPY] = sDreepyLevelUpLearnset, [SPECIES_DRAKLOAK] = sDrakloakLevelUpLearnset, [SPECIES_DRAGAPULT] = sDragapultLevelUpLearnset, - [SPECIES_ZACIAN] = sZacianLevelUpLearnset, - [SPECIES_ZAMAZENTA] = sZamazentaLevelUpLearnset, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sZacianLevelUpLearnset, + [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianLevelUpLearnset, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaLevelUpLearnset, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaLevelUpLearnset, [SPECIES_ETERNATUS] = sEternatusLevelUpLearnset, + [SPECIES_ETERNATUS_ETERNAMAX] = sEternatusLevelUpLearnset, [SPECIES_KUBFU] = sKubfuLevelUpLearnset, - [SPECIES_URSHIFU] = sUrshifuLevelUpLearnset, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = sUrshifuLevelUpLearnset, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = sUrshifuRapidStrikeStyleLevelUpLearnset, [SPECIES_ZARUDE] = sZarudeLevelUpLearnset, + [SPECIES_ZARUDE_DADA] = sZarudeLevelUpLearnset, [SPECIES_REGIELEKI] = sRegielekiLevelUpLearnset, [SPECIES_REGIDRAGO] = sRegidragoLevelUpLearnset, [SPECIES_GLASTRIER] = sGlastrierLevelUpLearnset, [SPECIES_SPECTRIER] = sSpectrierLevelUpLearnset, [SPECIES_CALYREX] = sCalyrexLevelUpLearnset, + [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderLevelUpLearnset, + [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset, [SPECIES_WYRDEER] = sWyrdeerLevelUpLearnset, [SPECIES_KLEAVOR] = sKleavorLevelUpLearnset, [SPECIES_URSALUNA] = sUrsalunaLevelUpLearnset, [SPECIES_BASCULEGION] = sBasculegionLevelUpLearnset, [SPECIES_SNEASLER] = sSneaslerLevelUpLearnset, [SPECIES_OVERQWIL] = sOverqwilLevelUpLearnset, - [SPECIES_ENAMORUS] = sEnamorusLevelUpLearnset, -#endif - // Megas - [SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset, - [SPECIES_CHARIZARD_MEGA_X] = sCharizardLevelUpLearnset, - [SPECIES_CHARIZARD_MEGA_Y] = sCharizardLevelUpLearnset, - [SPECIES_BLASTOISE_MEGA] = sBlastoiseLevelUpLearnset, - [SPECIES_BEEDRILL_MEGA] = sBeedrillLevelUpLearnset, - [SPECIES_PIDGEOT_MEGA] = sPidgeotLevelUpLearnset, - [SPECIES_ALAKAZAM_MEGA] = sAlakazamLevelUpLearnset, - [SPECIES_SLOWBRO_MEGA] = sSlowbroLevelUpLearnset, - [SPECIES_GENGAR_MEGA] = sGengarLevelUpLearnset, - [SPECIES_KANGASKHAN_MEGA] = sKangaskhanLevelUpLearnset, - [SPECIES_PINSIR_MEGA] = sPinsirLevelUpLearnset, - [SPECIES_GYARADOS_MEGA] = sGyaradosLevelUpLearnset, - [SPECIES_AERODACTYL_MEGA] = sAerodactylLevelUpLearnset, - [SPECIES_MEWTWO_MEGA_X] = sMewtwoLevelUpLearnset, - [SPECIES_MEWTWO_MEGA_Y] = sMewtwoLevelUpLearnset, - [SPECIES_AMPHAROS_MEGA] = sAmpharosLevelUpLearnset, - [SPECIES_STEELIX_MEGA] = sSteelixLevelUpLearnset, - [SPECIES_SCIZOR_MEGA] = sScizorLevelUpLearnset, - [SPECIES_HERACROSS_MEGA] = sHeracrossLevelUpLearnset, - [SPECIES_HOUNDOOM_MEGA] = sHoundoomLevelUpLearnset, - [SPECIES_TYRANITAR_MEGA] = sTyranitarLevelUpLearnset, - [SPECIES_SCEPTILE_MEGA] = sSceptileLevelUpLearnset, - [SPECIES_BLAZIKEN_MEGA] = sBlazikenLevelUpLearnset, - [SPECIES_SWAMPERT_MEGA] = sSwampertLevelUpLearnset, - [SPECIES_GARDEVOIR_MEGA] = sGardevoirLevelUpLearnset, - [SPECIES_SABLEYE_MEGA] = sSableyeLevelUpLearnset, - [SPECIES_MAWILE_MEGA] = sMawileLevelUpLearnset, - [SPECIES_AGGRON_MEGA] = sAggronLevelUpLearnset, - [SPECIES_MEDICHAM_MEGA] = sMedichamLevelUpLearnset, - [SPECIES_MANECTRIC_MEGA] = sManectricLevelUpLearnset, - [SPECIES_SHARPEDO_MEGA] = sSharpedoLevelUpLearnset, - [SPECIES_CAMERUPT_MEGA] = sCameruptLevelUpLearnset, - [SPECIES_ALTARIA_MEGA] = sAltariaLevelUpLearnset, - [SPECIES_BANETTE_MEGA] = sBanetteLevelUpLearnset, - [SPECIES_ABSOL_MEGA] = sAbsolLevelUpLearnset, - [SPECIES_GLALIE_MEGA] = sGlalieLevelUpLearnset, - [SPECIES_SALAMENCE_MEGA] = sSalamenceLevelUpLearnset, - [SPECIES_METAGROSS_MEGA] = sMetagrossLevelUpLearnset, - [SPECIES_LATIAS_MEGA] = sLatiasLevelUpLearnset, - [SPECIES_LATIOS_MEGA] = sLatiosLevelUpLearnset, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA] = sLopunnyLevelUpLearnset, - [SPECIES_GARCHOMP_MEGA] = sGarchompLevelUpLearnset, - [SPECIES_LUCARIO_MEGA] = sLucarioLevelUpLearnset, - [SPECIES_ABOMASNOW_MEGA] = sAbomasnowLevelUpLearnset, - [SPECIES_GALLADE_MEGA] = sGalladeLevelUpLearnset, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA] = sAudinoLevelUpLearnset, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA] = sDiancieLevelUpLearnset, -#endif - // Special Mega + Primals - [SPECIES_RAYQUAZA_MEGA] = sRayquazaLevelUpLearnset, - [SPECIES_KYOGRE_PRIMAL] = sKyogreLevelUpLearnset, - [SPECIES_GROUDON_PRIMAL] = sGroudonLevelUpLearnset, - // Alolan Forms - [SPECIES_RATTATA_ALOLAN] = sRattataAlolanLevelUpLearnset, - [SPECIES_RATICATE_ALOLAN] = sRaticateAlolanLevelUpLearnset, - [SPECIES_RAICHU_ALOLAN] = sRaichuAlolanLevelUpLearnset, - [SPECIES_SANDSHREW_ALOLAN] = sSandshrewAlolanLevelUpLearnset, - [SPECIES_SANDSLASH_ALOLAN] = sSandslashAlolanLevelUpLearnset, - [SPECIES_VULPIX_ALOLAN] = sVulpixAlolanLevelUpLearnset, - [SPECIES_NINETALES_ALOLAN] = sNinetalesAlolanLevelUpLearnset, - [SPECIES_DIGLETT_ALOLAN] = sDiglettAlolanLevelUpLearnset, - [SPECIES_DUGTRIO_ALOLAN] = sDugtrioAlolanLevelUpLearnset, - [SPECIES_MEOWTH_ALOLAN] = sMeowthAlolanLevelUpLearnset, - [SPECIES_PERSIAN_ALOLAN] = sPersianAlolanLevelUpLearnset, - [SPECIES_GEODUDE_ALOLAN] = sGeodudeAlolanLevelUpLearnset, - [SPECIES_GRAVELER_ALOLAN] = sGravelerAlolanLevelUpLearnset, - [SPECIES_GOLEM_ALOLAN] = sGolemAlolanLevelUpLearnset, - [SPECIES_GRIMER_ALOLAN] = sGrimerAlolanLevelUpLearnset, - [SPECIES_MUK_ALOLAN] = sMukAlolanLevelUpLearnset, - [SPECIES_EXEGGUTOR_ALOLAN] = sExeggutorAlolanLevelUpLearnset, - [SPECIES_MAROWAK_ALOLAN] = sMarowakAlolanLevelUpLearnset, - // Galarian Forms - [SPECIES_MEOWTH_GALARIAN] = sMeowthGalarianLevelUpLearnset, - [SPECIES_PONYTA_GALARIAN] = sPonytaGalarianLevelUpLearnset, - [SPECIES_RAPIDASH_GALARIAN] = sRapidashGalarianLevelUpLearnset, - [SPECIES_SLOWPOKE_GALARIAN] = sSlowpokeGalarianLevelUpLearnset, - [SPECIES_SLOWBRO_GALARIAN] = sSlowbroGalarianLevelUpLearnset, - [SPECIES_FARFETCHD_GALARIAN] = sFarfetchdGalarianLevelUpLearnset, - [SPECIES_WEEZING_GALARIAN] = sWeezingGalarianLevelUpLearnset, - [SPECIES_MR_MIME_GALARIAN] = sMrMimeGalarianLevelUpLearnset, - [SPECIES_ARTICUNO_GALARIAN] = sArticunoGalarianLevelUpLearnset, - [SPECIES_ZAPDOS_GALARIAN] = sZapdosGalarianLevelUpLearnset, - [SPECIES_MOLTRES_GALARIAN] = sMoltresGalarianLevelUpLearnset, - [SPECIES_SLOWKING_GALARIAN] = sSlowkingGalarianLevelUpLearnset, - [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianLevelUpLearnset, - [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianLevelUpLearnset, - [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianLevelUpLearnset, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianLevelUpLearnset, - [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianLevelUpLearnset, - [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset, - [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianLevelUpLearnset, -#endif - // Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianLevelUpLearnset, - [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianLevelUpLearnset, - [SPECIES_VOLTORB_HISUIAN] = sVoltorbHisuianLevelUpLearnset, - [SPECIES_ELECTRODE_HISUIAN] = sElectrodeHisuianLevelUpLearnset, - [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianLevelUpLearnset, - [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianLevelUpLearnset, - [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianLevelUpLearnset, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianLevelUpLearnset, - [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianLevelUpLearnset, - [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianLevelUpLearnset, - [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianLevelUpLearnset, - [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianLevelUpLearnset, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianLevelUpLearnset, - [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianLevelUpLearnset, - [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianLevelUpLearnset, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset, -#endif - // Misc Forms - // Cosplay Pikachu - [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_ROCK_STAR] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_BELLE] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_POP_STAR] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_PH_D] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_LIBRE] = sPikachuLevelUpLearnset, - // Cap Pikachu - [SPECIES_PIKACHU_ORIGINAL_CAP] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_HOENN_CAP] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_SINNOH_CAP] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_UNOVA_CAP] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_KALOS_CAP] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_ALOLA_CAP] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_PARTNER_CAP] = sPikachuLevelUpLearnset, - [SPECIES_PIKACHU_WORLD_CAP] = sPikachuLevelUpLearnset, - // Pichu -#if P_GEN_4_POKEMON == TRUE - // Origin Forme - [SPECIES_DIALGA_ORIGIN] = sDialgaLevelUpLearnset, - [SPECIES_PALKIA_ORIGIN] = sPalkiaLevelUpLearnset, - // Arceus - [SPECIES_ARCEUS_FAIRY] = sArceusLevelUpLearnset, -#endif -#if P_GEN_5_POKEMON == TRUE - - [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset, - // Darmanitan - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanGalarianLevelUpLearnset, -#endif -#if P_GEN_6_POKEMON == TRUE - // Greninja - [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaLevelUpLearnset, - [SPECIES_GRENINJA_ASH] = sGreninjaLevelUpLearnset, - // Vivillon - [SPECIES_VIVILLON_POLAR] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_TUNDRA] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_CONTINENTAL] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_GARDEN] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_ELEGANT] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_MEADOW] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_MODERN] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_MARINE] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_ARCHIPELAGO] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_HIGH_PLAINS] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_SANDSTORM] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_RIVER] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_MONSOON] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_SAVANNA] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_SUN] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_OCEAN] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_JUNGLE] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_FANCY] = sVivillonLevelUpLearnset, - [SPECIES_VIVILLON_POKE_BALL] = sVivillonLevelUpLearnset, - // Flabébé - [SPECIES_FLABEBE_YELLOW_FLOWER] = sFlabebeLevelUpLearnset, - [SPECIES_FLABEBE_ORANGE_FLOWER] = sFlabebeLevelUpLearnset, - [SPECIES_FLABEBE_BLUE_FLOWER] = sFlabebeLevelUpLearnset, - [SPECIES_FLABEBE_WHITE_FLOWER] = sFlabebeLevelUpLearnset, - // Floette - [SPECIES_FLOETTE_YELLOW_FLOWER] = sFloetteLevelUpLearnset, - [SPECIES_FLOETTE_ORANGE_FLOWER] = sFloetteLevelUpLearnset, - [SPECIES_FLOETTE_BLUE_FLOWER] = sFloetteLevelUpLearnset, - [SPECIES_FLOETTE_WHITE_FLOWER] = sFloetteLevelUpLearnset, - [SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteEternalFlowerLevelUpLearnset, - // Florges - [SPECIES_FLORGES_YELLOW_FLOWER] = sFlorgesLevelUpLearnset, - [SPECIES_FLORGES_ORANGE_FLOWER] = sFlorgesLevelUpLearnset, - [SPECIES_FLORGES_BLUE_FLOWER] = sFlorgesLevelUpLearnset, - [SPECIES_FLORGES_WHITE_FLOWER] = sFlorgesLevelUpLearnset, - //Furfrou - [SPECIES_FURFROU_HEART_TRIM] = sFurfrouLevelUpLearnset, - [SPECIES_FURFROU_STAR_TRIM] = sFurfrouLevelUpLearnset, - [SPECIES_FURFROU_DIAMOND_TRIM] = sFurfrouLevelUpLearnset, - [SPECIES_FURFROU_DEBUTANTE_TRIM] = sFurfrouLevelUpLearnset, - [SPECIES_FURFROU_MATRON_TRIM] = sFurfrouLevelUpLearnset, - [SPECIES_FURFROU_DANDY_TRIM] = sFurfrouLevelUpLearnset, - [SPECIES_FURFROU_LA_REINE_TRIM] = sFurfrouLevelUpLearnset, - [SPECIES_FURFROU_KABUKI_TRIM] = sFurfrouLevelUpLearnset, - [SPECIES_FURFROU_PHARAOH_TRIM] = sFurfrouLevelUpLearnset, - // Meowstic - [SPECIES_MEOWSTIC_FEMALE] = sMeowsticFemaleLevelUpLearnset, - // Aegislash - [SPECIES_AEGISLASH_BLADE] = sAegislashLevelUpLearnset, - // Pumpkaboo - [SPECIES_PUMPKABOO_SMALL] = sPumpkabooLevelUpLearnset, - [SPECIES_PUMPKABOO_LARGE] = sPumpkabooLevelUpLearnset, - [SPECIES_PUMPKABOO_SUPER] = sPumpkabooLevelUpLearnset, - // Gourgeist - [SPECIES_GOURGEIST_SMALL] = sGourgeistLevelUpLearnset, - [SPECIES_GOURGEIST_LARGE] = sGourgeistLevelUpLearnset, - [SPECIES_GOURGEIST_SUPER] = sGourgeistLevelUpLearnset, - // Xerneas - [SPECIES_XERNEAS_ACTIVE] = sXerneasLevelUpLearnset, - // Zygarde - [SPECIES_ZYGARDE_10] = sZygardeLevelUpLearnset, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardeLevelUpLearnset, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardeLevelUpLearnset, - [SPECIES_ZYGARDE_COMPLETE] = sZygardeLevelUpLearnset, - // Hoopa - [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset, -#endif -#if P_GEN_7_POKEMON == TRUE - // Oricorio - [SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset, - [SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset, - [SPECIES_ORICORIO_SENSU] = sOricorioLevelUpLearnset, - // Rockruff - [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffLevelUpLearnset, - // Lycanroc - [SPECIES_LYCANROC_MIDNIGHT] = sLycanrocMidnightLevelUpLearnset, - [SPECIES_LYCANROC_DUSK] = sLycanrocDuskLevelUpLearnset, - // Wishiwashi - [SPECIES_WISHIWASHI_SCHOOL] = sWishiwashiLevelUpLearnset, - // Silvally - [SPECIES_SILVALLY_FIGHTING] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_FLYING] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_POISON] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_GROUND] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_ROCK] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_BUG] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_GHOST] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_STEEL] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_FIRE] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_WATER] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_GRASS] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_ELECTRIC] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_PSYCHIC] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_ICE] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_DRAGON] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_DARK] = sSilvallyLevelUpLearnset, - [SPECIES_SILVALLY_FAIRY] = sSilvallyLevelUpLearnset, - // Minior - [SPECIES_MINIOR_METEOR_ORANGE] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_METEOR_YELLOW] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_METEOR_GREEN] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_METEOR_BLUE] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_METEOR_INDIGO] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_METEOR_VIOLET] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_CORE_RED] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_CORE_ORANGE] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_CORE_YELLOW] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_CORE_GREEN] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_CORE_BLUE] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_CORE_INDIGO] = sMiniorLevelUpLearnset, - [SPECIES_MINIOR_CORE_VIOLET] = sMiniorLevelUpLearnset, - // Mimikyu - [SPECIES_MIMIKYU_BUSTED] = sMimikyuLevelUpLearnset, - // Necrozma - [SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaLevelUpLearnset, - [SPECIES_NECROZMA_DAWN_WINGS] = sNecrozmaLevelUpLearnset, - [SPECIES_NECROZMA_ULTRA] = sNecrozmaLevelUpLearnset, - // Magearna - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaLevelUpLearnset, -#endif -#if P_GEN_8_POKEMON == TRUE - // Cramorant - [SPECIES_CRAMORANT_GULPING] = sCramorantLevelUpLearnset, - [SPECIES_CRAMORANT_GORGING] = sCramorantLevelUpLearnset, - // Toxtricity - [SPECIES_TOXTRICITY_LOW_KEY] = sToxtricityLowKeyLevelUpLearnset, - // Sinistea - [SPECIES_SINISTEA_ANTIQUE] = sSinisteaLevelUpLearnset, - // Polteageist - [SPECIES_POLTEAGEIST_ANTIQUE] = sPolteageistLevelUpLearnset, - // Alcremie - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAlcremieLevelUpLearnset, - // Eiscue - [SPECIES_EISCUE_NOICE_FACE] = sEiscueLevelUpLearnset, - // Indeedee - [SPECIES_INDEEDEE_FEMALE] = sIndeedeeFemaleLevelUpLearnset, - // Morpeko - [SPECIES_MORPEKO_HANGRY] = sMorpekoLevelUpLearnset, - // Zacian - [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianLevelUpLearnset, - // Zamazenta - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaLevelUpLearnset, - // Eternatus - [SPECIES_ETERNATUS_ETERNAMAX] = sEternatusLevelUpLearnset, - // Urshifu - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = sUrshifuRapidStrikeStyleLevelUpLearnset, - // Zarude - [SPECIES_ZARUDE_DADA] = sZarudeLevelUpLearnset, - // Calyrex - [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderLevelUpLearnset, - [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset, - // Enamorus + [SPECIES_ENAMORUS_INCARNATE] = sEnamorusLevelUpLearnset, [SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset, #endif }; diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 5ac6486ac1..b5344b0a4f 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -4,31 +4,56 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_BULBASAUR] = sBulbasaurTeachableLearnset, [SPECIES_IVYSAUR] = sIvysaurTeachableLearnset, [SPECIES_VENUSAUR] = sVenusaurTeachableLearnset, + [SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset, [SPECIES_CHARMANDER] = sCharmanderTeachableLearnset, [SPECIES_CHARMELEON] = sCharmeleonTeachableLearnset, [SPECIES_CHARIZARD] = sCharizardTeachableLearnset, + [SPECIES_CHARIZARD_MEGA_X] = sCharizardTeachableLearnset, + [SPECIES_CHARIZARD_MEGA_Y] = sCharizardTeachableLearnset, [SPECIES_SQUIRTLE] = sSquirtleTeachableLearnset, [SPECIES_WARTORTLE] = sWartortleTeachableLearnset, [SPECIES_BLASTOISE] = sBlastoiseTeachableLearnset, + [SPECIES_BLASTOISE_MEGA] = sBlastoiseTeachableLearnset, [SPECIES_CATERPIE] = sCaterpieTeachableLearnset, [SPECIES_METAPOD] = sMetapodTeachableLearnset, [SPECIES_BUTTERFREE] = sButterfreeTeachableLearnset, [SPECIES_WEEDLE] = sWeedleTeachableLearnset, [SPECIES_KAKUNA] = sKakunaTeachableLearnset, [SPECIES_BEEDRILL] = sBeedrillTeachableLearnset, + [SPECIES_BEEDRILL_MEGA] = sBeedrillTeachableLearnset, [SPECIES_PIDGEY] = sPidgeyTeachableLearnset, [SPECIES_PIDGEOTTO] = sPidgeottoTeachableLearnset, [SPECIES_PIDGEOT] = sPidgeotTeachableLearnset, + [SPECIES_PIDGEOT_MEGA] = sPidgeotTeachableLearnset, [SPECIES_RATTATA] = sRattataTeachableLearnset, + [SPECIES_RATTATA_ALOLAN] = sRattataAlolanTeachableLearnset, [SPECIES_RATICATE] = sRaticateTeachableLearnset, + [SPECIES_RATICATE_ALOLAN] = sRaticateAlolanTeachableLearnset, [SPECIES_SPEAROW] = sSpearowTeachableLearnset, [SPECIES_FEAROW] = sFearowTeachableLearnset, [SPECIES_EKANS] = sEkansTeachableLearnset, [SPECIES_ARBOK] = sArbokTeachableLearnset, [SPECIES_PIKACHU] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_COSPLAY] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_ROCK_STAR] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_BELLE] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_POP_STAR] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_PH_D] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_LIBRE] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_ORIGINAL_CAP] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_HOENN_CAP] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_SINNOH_CAP] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_UNOVA_CAP] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_KALOS_CAP] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_ALOLA_CAP] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_PARTNER_CAP] = sPikachuTeachableLearnset, + [SPECIES_PIKACHU_WORLD_CAP] = sPikachuTeachableLearnset, [SPECIES_RAICHU] = sRaichuTeachableLearnset, + [SPECIES_RAICHU_ALOLAN] = sRaichuAlolanTeachableLearnset, [SPECIES_SANDSHREW] = sSandshrewTeachableLearnset, + [SPECIES_SANDSHREW_ALOLAN] = sSandshrewAlolanTeachableLearnset, [SPECIES_SANDSLASH] = sSandslashTeachableLearnset, + [SPECIES_SANDSLASH_ALOLAN] = sSandslashAlolanTeachableLearnset, [SPECIES_NIDORAN_F] = sNidoranFTeachableLearnset, [SPECIES_NIDORINA] = sNidorinaTeachableLearnset, [SPECIES_NIDOQUEEN] = sNidoqueenTeachableLearnset, @@ -38,7 +63,9 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CLEFAIRY] = sClefairyTeachableLearnset, [SPECIES_CLEFABLE] = sClefableTeachableLearnset, [SPECIES_VULPIX] = sVulpixTeachableLearnset, + [SPECIES_VULPIX_ALOLAN] = sVulpixAlolanTeachableLearnset, [SPECIES_NINETALES] = sNinetalesTeachableLearnset, + [SPECIES_NINETALES_ALOLAN] = sNinetalesAlolanTeachableLearnset, [SPECIES_JIGGLYPUFF] = sJigglypuffTeachableLearnset, [SPECIES_WIGGLYTUFF] = sWigglytuffTeachableLearnset, [SPECIES_ZUBAT] = sZubatTeachableLearnset, @@ -51,21 +78,29 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_VENONAT] = sVenonatTeachableLearnset, [SPECIES_VENOMOTH] = sVenomothTeachableLearnset, [SPECIES_DIGLETT] = sDiglettTeachableLearnset, + [SPECIES_DIGLETT_ALOLAN] = sDiglettAlolanTeachableLearnset, [SPECIES_DUGTRIO] = sDugtrioTeachableLearnset, + [SPECIES_DUGTRIO_ALOLAN] = sDugtrioAlolanTeachableLearnset, [SPECIES_MEOWTH] = sMeowthTeachableLearnset, + [SPECIES_MEOWTH_ALOLAN] = sMeowthAlolanTeachableLearnset, + [SPECIES_MEOWTH_GALARIAN] = sMeowthGalarianTeachableLearnset, [SPECIES_PERSIAN] = sPersianTeachableLearnset, + [SPECIES_PERSIAN_ALOLAN] = sPersianAlolanTeachableLearnset, [SPECIES_PSYDUCK] = sPsyduckTeachableLearnset, [SPECIES_GOLDUCK] = sGolduckTeachableLearnset, [SPECIES_MANKEY] = sMankeyTeachableLearnset, [SPECIES_PRIMEAPE] = sPrimeapeTeachableLearnset, [SPECIES_GROWLITHE] = sGrowlitheTeachableLearnset, + [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianTeachableLearnset, [SPECIES_ARCANINE] = sArcanineTeachableLearnset, + [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianTeachableLearnset, [SPECIES_POLIWAG] = sPoliwagTeachableLearnset, [SPECIES_POLIWHIRL] = sPoliwhirlTeachableLearnset, [SPECIES_POLIWRATH] = sPoliwrathTeachableLearnset, [SPECIES_ABRA] = sAbraTeachableLearnset, [SPECIES_KADABRA] = sKadabraTeachableLearnset, [SPECIES_ALAKAZAM] = sAlakazamTeachableLearnset, + [SPECIES_ALAKAZAM_MEGA] = sAlakazamTeachableLearnset, [SPECIES_MACHOP] = sMachopTeachableLearnset, [SPECIES_MACHOKE] = sMachokeTeachableLearnset, [SPECIES_MACHAMP] = sMachampTeachableLearnset, @@ -75,47 +110,65 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_TENTACOOL] = sTentacoolTeachableLearnset, [SPECIES_TENTACRUEL] = sTentacruelTeachableLearnset, [SPECIES_GEODUDE] = sGeodudeTeachableLearnset, + [SPECIES_GEODUDE_ALOLAN] = sGeodudeAlolanTeachableLearnset, [SPECIES_GRAVELER] = sGravelerTeachableLearnset, + [SPECIES_GRAVELER_ALOLAN] = sGravelerAlolanTeachableLearnset, [SPECIES_GOLEM] = sGolemTeachableLearnset, + [SPECIES_GOLEM_ALOLAN] = sGolemAlolanTeachableLearnset, [SPECIES_PONYTA] = sPonytaTeachableLearnset, + [SPECIES_PONYTA_GALARIAN] = sPonytaGalarianTeachableLearnset, [SPECIES_RAPIDASH] = sRapidashTeachableLearnset, + [SPECIES_RAPIDASH_GALARIAN] = sRapidashGalarianTeachableLearnset, [SPECIES_SLOWPOKE] = sSlowpokeTeachableLearnset, + [SPECIES_SLOWPOKE_GALARIAN] = sSlowpokeGalarianTeachableLearnset, [SPECIES_SLOWBRO] = sSlowbroTeachableLearnset, + [SPECIES_SLOWBRO_GALARIAN] = sSlowbroGalarianTeachableLearnset, + [SPECIES_SLOWBRO_MEGA] = sSlowbroTeachableLearnset, [SPECIES_MAGNEMITE] = sMagnemiteTeachableLearnset, [SPECIES_MAGNETON] = sMagnetonTeachableLearnset, [SPECIES_FARFETCHD] = sFarfetchdTeachableLearnset, + [SPECIES_FARFETCHD_GALARIAN] = sFarfetchdGalarianTeachableLearnset, [SPECIES_DODUO] = sDoduoTeachableLearnset, [SPECIES_DODRIO] = sDodrioTeachableLearnset, [SPECIES_SEEL] = sSeelTeachableLearnset, [SPECIES_DEWGONG] = sDewgongTeachableLearnset, [SPECIES_GRIMER] = sGrimerTeachableLearnset, + [SPECIES_GRIMER_ALOLAN] = sGrimerAlolanTeachableLearnset, [SPECIES_MUK] = sMukTeachableLearnset, + [SPECIES_MUK_ALOLAN] = sMukAlolanTeachableLearnset, [SPECIES_SHELLDER] = sShellderTeachableLearnset, [SPECIES_CLOYSTER] = sCloysterTeachableLearnset, [SPECIES_GASTLY] = sGastlyTeachableLearnset, [SPECIES_HAUNTER] = sHaunterTeachableLearnset, [SPECIES_GENGAR] = sGengarTeachableLearnset, + [SPECIES_GENGAR_MEGA] = sGengarTeachableLearnset, [SPECIES_ONIX] = sOnixTeachableLearnset, [SPECIES_DROWZEE] = sDrowzeeTeachableLearnset, [SPECIES_HYPNO] = sHypnoTeachableLearnset, [SPECIES_KRABBY] = sKrabbyTeachableLearnset, [SPECIES_KINGLER] = sKinglerTeachableLearnset, [SPECIES_VOLTORB] = sVoltorbTeachableLearnset, + [SPECIES_VOLTORB_HISUIAN] = sVoltorbHisuianTeachableLearnset, [SPECIES_ELECTRODE] = sElectrodeTeachableLearnset, + [SPECIES_ELECTRODE_HISUIAN] = sElectrodeHisuianTeachableLearnset, [SPECIES_EXEGGCUTE] = sExeggcuteTeachableLearnset, [SPECIES_EXEGGUTOR] = sExeggutorTeachableLearnset, + [SPECIES_EXEGGUTOR_ALOLAN] = sExeggutorAlolanTeachableLearnset, [SPECIES_CUBONE] = sCuboneTeachableLearnset, [SPECIES_MAROWAK] = sMarowakTeachableLearnset, + [SPECIES_MAROWAK_ALOLAN] = sMarowakAlolanTeachableLearnset, [SPECIES_HITMONLEE] = sHitmonleeTeachableLearnset, [SPECIES_HITMONCHAN] = sHitmonchanTeachableLearnset, [SPECIES_LICKITUNG] = sLickitungTeachableLearnset, [SPECIES_KOFFING] = sKoffingTeachableLearnset, [SPECIES_WEEZING] = sWeezingTeachableLearnset, + [SPECIES_WEEZING_GALARIAN] = sWeezingGalarianTeachableLearnset, [SPECIES_RHYHORN] = sRhyhornTeachableLearnset, [SPECIES_RHYDON] = sRhydonTeachableLearnset, [SPECIES_CHANSEY] = sChanseyTeachableLearnset, [SPECIES_TANGELA] = sTangelaTeachableLearnset, [SPECIES_KANGASKHAN] = sKangaskhanTeachableLearnset, + [SPECIES_KANGASKHAN_MEGA] = sKangaskhanTeachableLearnset, [SPECIES_HORSEA] = sHorseaTeachableLearnset, [SPECIES_SEADRA] = sSeadraTeachableLearnset, [SPECIES_GOLDEEN] = sGoldeenTeachableLearnset, @@ -123,14 +176,17 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_STARYU] = sStaryuTeachableLearnset, [SPECIES_STARMIE] = sStarmieTeachableLearnset, [SPECIES_MR_MIME] = sMrMimeTeachableLearnset, + [SPECIES_MR_MIME_GALARIAN] = sMrMimeGalarianTeachableLearnset, [SPECIES_SCYTHER] = sScytherTeachableLearnset, [SPECIES_JYNX] = sJynxTeachableLearnset, [SPECIES_ELECTABUZZ] = sElectabuzzTeachableLearnset, [SPECIES_MAGMAR] = sMagmarTeachableLearnset, [SPECIES_PINSIR] = sPinsirTeachableLearnset, + [SPECIES_PINSIR_MEGA] = sPinsirTeachableLearnset, [SPECIES_TAUROS] = sTaurosTeachableLearnset, [SPECIES_MAGIKARP] = sMagikarpTeachableLearnset, [SPECIES_GYARADOS] = sGyaradosTeachableLearnset, + [SPECIES_GYARADOS_MEGA] = sGyaradosTeachableLearnset, [SPECIES_LAPRAS] = sLaprasTeachableLearnset, [SPECIES_DITTO] = sDittoTeachableLearnset, [SPECIES_EEVEE] = sEeveeTeachableLearnset, @@ -143,14 +199,20 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_KABUTO] = sKabutoTeachableLearnset, [SPECIES_KABUTOPS] = sKabutopsTeachableLearnset, [SPECIES_AERODACTYL] = sAerodactylTeachableLearnset, + [SPECIES_AERODACTYL_MEGA] = sAerodactylTeachableLearnset, [SPECIES_SNORLAX] = sSnorlaxTeachableLearnset, [SPECIES_ARTICUNO] = sArticunoTeachableLearnset, + [SPECIES_ARTICUNO_GALARIAN] = sArticunoGalarianTeachableLearnset, [SPECIES_ZAPDOS] = sZapdosTeachableLearnset, + [SPECIES_ZAPDOS_GALARIAN] = sZapdosGalarianTeachableLearnset, [SPECIES_MOLTRES] = sMoltresTeachableLearnset, + [SPECIES_MOLTRES_GALARIAN] = sMoltresGalarianTeachableLearnset, [SPECIES_DRATINI] = sDratiniTeachableLearnset, [SPECIES_DRAGONAIR] = sDragonairTeachableLearnset, [SPECIES_DRAGONITE] = sDragoniteTeachableLearnset, [SPECIES_MEWTWO] = sMewtwoTeachableLearnset, + [SPECIES_MEWTWO_MEGA_X] = sMewtwoTeachableLearnset, + [SPECIES_MEWTWO_MEGA_Y] = sMewtwoTeachableLearnset, [SPECIES_MEW] = sMewTeachableLearnset, [SPECIES_CHIKORITA] = sChikoritaTeachableLearnset, [SPECIES_BAYLEEF] = sBayleefTeachableLearnset, @@ -158,6 +220,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CYNDAQUIL] = sCyndaquilTeachableLearnset, [SPECIES_QUILAVA] = sQuilavaTeachableLearnset, [SPECIES_TYPHLOSION] = sTyphlosionTeachableLearnset, + [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianTeachableLearnset, [SPECIES_TOTODILE] = sTotodileTeachableLearnset, [SPECIES_CROCONAW] = sCroconawTeachableLearnset, [SPECIES_FERALIGATR] = sFeraligatrTeachableLearnset, @@ -173,6 +236,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CHINCHOU] = sChinchouTeachableLearnset, [SPECIES_LANTURN] = sLanturnTeachableLearnset, [SPECIES_PICHU] = sPichuTeachableLearnset, + [SPECIES_PICHU_SPIKY_EARED] = sPichuTeachableLearnset, [SPECIES_CLEFFA] = sCleffaTeachableLearnset, [SPECIES_IGGLYBUFF] = sIgglybuffTeachableLearnset, [SPECIES_TOGEPI] = sTogepiTeachableLearnset, @@ -182,6 +246,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MAREEP] = sMareepTeachableLearnset, [SPECIES_FLAAFFY] = sFlaaffyTeachableLearnset, [SPECIES_AMPHAROS] = sAmpharosTeachableLearnset, + [SPECIES_AMPHAROS_MEGA] = sAmpharosTeachableLearnset, [SPECIES_BELLOSSOM] = sBellossomTeachableLearnset, [SPECIES_MARILL] = sMarillTeachableLearnset, [SPECIES_AZUMARILL] = sAzumarillTeachableLearnset, @@ -200,6 +265,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_UMBREON] = sUmbreonTeachableLearnset, [SPECIES_MURKROW] = sMurkrowTeachableLearnset, [SPECIES_SLOWKING] = sSlowkingTeachableLearnset, + [SPECIES_SLOWKING_GALARIAN] = sSlowkingGalarianTeachableLearnset, [SPECIES_MISDREAVUS] = sMisdreavusTeachableLearnset, [SPECIES_UNOWN] = sUnownTeachableLearnset, [SPECIES_UNOWN_B] = sUnownTeachableLearnset, @@ -236,13 +302,18 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DUNSPARCE] = sDunsparceTeachableLearnset, [SPECIES_GLIGAR] = sGligarTeachableLearnset, [SPECIES_STEELIX] = sSteelixTeachableLearnset, + [SPECIES_STEELIX_MEGA] = sSteelixTeachableLearnset, [SPECIES_SNUBBULL] = sSnubbullTeachableLearnset, [SPECIES_GRANBULL] = sGranbullTeachableLearnset, [SPECIES_QWILFISH] = sQwilfishTeachableLearnset, + [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianTeachableLearnset, [SPECIES_SCIZOR] = sScizorTeachableLearnset, + [SPECIES_SCIZOR_MEGA] = sScizorTeachableLearnset, [SPECIES_SHUCKLE] = sShuckleTeachableLearnset, [SPECIES_HERACROSS] = sHeracrossTeachableLearnset, + [SPECIES_HERACROSS_MEGA] = sHeracrossTeachableLearnset, [SPECIES_SNEASEL] = sSneaselTeachableLearnset, + [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianTeachableLearnset, [SPECIES_TEDDIURSA] = sTeddiursaTeachableLearnset, [SPECIES_URSARING] = sUrsaringTeachableLearnset, [SPECIES_SLUGMA] = sSlugmaTeachableLearnset, @@ -250,6 +321,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SWINUB] = sSwinubTeachableLearnset, [SPECIES_PILOSWINE] = sPiloswineTeachableLearnset, [SPECIES_CORSOLA] = sCorsolaTeachableLearnset, + [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianTeachableLearnset, [SPECIES_REMORAID] = sRemoraidTeachableLearnset, [SPECIES_OCTILLERY] = sOctilleryTeachableLearnset, [SPECIES_DELIBIRD] = sDelibirdTeachableLearnset, @@ -257,6 +329,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SKARMORY] = sSkarmoryTeachableLearnset, [SPECIES_HOUNDOUR] = sHoundourTeachableLearnset, [SPECIES_HOUNDOOM] = sHoundoomTeachableLearnset, + [SPECIES_HOUNDOOM_MEGA] = sHoundoomTeachableLearnset, [SPECIES_KINGDRA] = sKingdraTeachableLearnset, [SPECIES_PHANPY] = sPhanpyTeachableLearnset, [SPECIES_DONPHAN] = sDonphanTeachableLearnset, @@ -276,22 +349,28 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_LARVITAR] = sLarvitarTeachableLearnset, [SPECIES_PUPITAR] = sPupitarTeachableLearnset, [SPECIES_TYRANITAR] = sTyranitarTeachableLearnset, + [SPECIES_TYRANITAR_MEGA] = sTyranitarTeachableLearnset, [SPECIES_LUGIA] = sLugiaTeachableLearnset, [SPECIES_HO_OH] = sHoOhTeachableLearnset, [SPECIES_CELEBI] = sCelebiTeachableLearnset, [SPECIES_TREECKO] = sTreeckoTeachableLearnset, [SPECIES_GROVYLE] = sGrovyleTeachableLearnset, [SPECIES_SCEPTILE] = sSceptileTeachableLearnset, + [SPECIES_SCEPTILE_MEGA] = sSceptileTeachableLearnset, [SPECIES_TORCHIC] = sTorchicTeachableLearnset, [SPECIES_COMBUSKEN] = sCombuskenTeachableLearnset, [SPECIES_BLAZIKEN] = sBlazikenTeachableLearnset, + [SPECIES_BLAZIKEN_MEGA] = sBlazikenTeachableLearnset, [SPECIES_MUDKIP] = sMudkipTeachableLearnset, [SPECIES_MARSHTOMP] = sMarshtompTeachableLearnset, [SPECIES_SWAMPERT] = sSwampertTeachableLearnset, + [SPECIES_SWAMPERT_MEGA] = sSwampertTeachableLearnset, [SPECIES_POOCHYENA] = sPoochyenaTeachableLearnset, [SPECIES_MIGHTYENA] = sMightyenaTeachableLearnset, [SPECIES_ZIGZAGOON] = sZigzagoonTeachableLearnset, + [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianTeachableLearnset, [SPECIES_LINOONE] = sLinooneTeachableLearnset, + [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianTeachableLearnset, [SPECIES_WURMPLE] = sWurmpleTeachableLearnset, [SPECIES_SILCOON] = sSilcoonTeachableLearnset, [SPECIES_BEAUTIFLY] = sBeautiflyTeachableLearnset, @@ -310,6 +389,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_RALTS] = sRaltsTeachableLearnset, [SPECIES_KIRLIA] = sKirliaTeachableLearnset, [SPECIES_GARDEVOIR] = sGardevoirTeachableLearnset, + [SPECIES_GARDEVOIR_MEGA] = sGardevoirTeachableLearnset, [SPECIES_SURSKIT] = sSurskitTeachableLearnset, [SPECIES_MASQUERAIN] = sMasquerainTeachableLearnset, [SPECIES_SHROOMISH] = sShroomishTeachableLearnset, @@ -330,14 +410,19 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SKITTY] = sSkittyTeachableLearnset, [SPECIES_DELCATTY] = sDelcattyTeachableLearnset, [SPECIES_SABLEYE] = sSableyeTeachableLearnset, + [SPECIES_SABLEYE_MEGA] = sSableyeTeachableLearnset, [SPECIES_MAWILE] = sMawileTeachableLearnset, + [SPECIES_MAWILE_MEGA] = sMawileTeachableLearnset, [SPECIES_ARON] = sAronTeachableLearnset, [SPECIES_LAIRON] = sLaironTeachableLearnset, [SPECIES_AGGRON] = sAggronTeachableLearnset, + [SPECIES_AGGRON_MEGA] = sAggronTeachableLearnset, [SPECIES_MEDITITE] = sMedititeTeachableLearnset, [SPECIES_MEDICHAM] = sMedichamTeachableLearnset, + [SPECIES_MEDICHAM_MEGA] = sMedichamTeachableLearnset, [SPECIES_ELECTRIKE] = sElectrikeTeachableLearnset, [SPECIES_MANECTRIC] = sManectricTeachableLearnset, + [SPECIES_MANECTRIC_MEGA] = sManectricTeachableLearnset, [SPECIES_PLUSLE] = sPlusleTeachableLearnset, [SPECIES_MINUN] = sMinunTeachableLearnset, [SPECIES_VOLBEAT] = sVolbeatTeachableLearnset, @@ -347,10 +432,12 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SWALOT] = sSwalotTeachableLearnset, [SPECIES_CARVANHA] = sCarvanhaTeachableLearnset, [SPECIES_SHARPEDO] = sSharpedoTeachableLearnset, + [SPECIES_SHARPEDO_MEGA] = sSharpedoTeachableLearnset, [SPECIES_WAILMER] = sWailmerTeachableLearnset, [SPECIES_WAILORD] = sWailordTeachableLearnset, [SPECIES_NUMEL] = sNumelTeachableLearnset, [SPECIES_CAMERUPT] = sCameruptTeachableLearnset, + [SPECIES_CAMERUPT_MEGA] = sCameruptTeachableLearnset, [SPECIES_TORKOAL] = sTorkoalTeachableLearnset, [SPECIES_SPOINK] = sSpoinkTeachableLearnset, [SPECIES_GRUMPIG] = sGrumpigTeachableLearnset, @@ -362,6 +449,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CACTURNE] = sCacturneTeachableLearnset, [SPECIES_SWABLU] = sSwabluTeachableLearnset, [SPECIES_ALTARIA] = sAltariaTeachableLearnset, + [SPECIES_ALTARIA_MEGA] = sAltariaTeachableLearnset, [SPECIES_ZANGOOSE] = sZangooseTeachableLearnset, [SPECIES_SEVIPER] = sSeviperTeachableLearnset, [SPECIES_LUNATONE] = sLunatoneTeachableLearnset, @@ -385,14 +473,17 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_KECLEON] = sKecleonTeachableLearnset, [SPECIES_SHUPPET] = sShuppetTeachableLearnset, [SPECIES_BANETTE] = sBanetteTeachableLearnset, + [SPECIES_BANETTE_MEGA] = sBanetteTeachableLearnset, [SPECIES_DUSKULL] = sDuskullTeachableLearnset, [SPECIES_DUSCLOPS] = sDusclopsTeachableLearnset, [SPECIES_TROPIUS] = sTropiusTeachableLearnset, [SPECIES_CHIMECHO] = sChimechoTeachableLearnset, [SPECIES_ABSOL] = sAbsolTeachableLearnset, + [SPECIES_ABSOL_MEGA] = sAbsolTeachableLearnset, [SPECIES_WYNAUT] = sWynautTeachableLearnset, [SPECIES_SNORUNT] = sSnoruntTeachableLearnset, [SPECIES_GLALIE] = sGlalieTeachableLearnset, + [SPECIES_GLALIE_MEGA] = sGlalieTeachableLearnset, [SPECIES_SPHEAL] = sSphealTeachableLearnset, [SPECIES_SEALEO] = sSealeoTeachableLearnset, [SPECIES_WALREIN] = sWalreinTeachableLearnset, @@ -404,24 +495,30 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_BAGON] = sBagonTeachableLearnset, [SPECIES_SHELGON] = sShelgonTeachableLearnset, [SPECIES_SALAMENCE] = sSalamenceTeachableLearnset, + [SPECIES_SALAMENCE_MEGA] = sSalamenceTeachableLearnset, [SPECIES_BELDUM] = sBeldumTeachableLearnset, [SPECIES_METANG] = sMetangTeachableLearnset, [SPECIES_METAGROSS] = sMetagrossTeachableLearnset, + [SPECIES_METAGROSS_MEGA] = sMetagrossTeachableLearnset, [SPECIES_REGIROCK] = sRegirockTeachableLearnset, [SPECIES_REGICE] = sRegiceTeachableLearnset, [SPECIES_REGISTEEL] = sRegisteelTeachableLearnset, [SPECIES_LATIAS] = sLatiasTeachableLearnset, + [SPECIES_LATIAS_MEGA] = sLatiasTeachableLearnset, [SPECIES_LATIOS] = sLatiosTeachableLearnset, + [SPECIES_LATIOS_MEGA] = sLatiosTeachableLearnset, [SPECIES_KYOGRE] = sKyogreTeachableLearnset, + [SPECIES_KYOGRE_PRIMAL] = sKyogreTeachableLearnset, [SPECIES_GROUDON] = sGroudonTeachableLearnset, + [SPECIES_GROUDON_PRIMAL] = sGroudonTeachableLearnset, [SPECIES_RAYQUAZA] = sRayquazaTeachableLearnset, + [SPECIES_RAYQUAZA_MEGA] = sRayquazaTeachableLearnset, [SPECIES_JIRACHI] = sJirachiTeachableLearnset, [SPECIES_DEOXYS_NORMAL] = sDeoxysTeachableLearnset, [SPECIES_DEOXYS_ATTACK] = sDeoxysAttackTeachableLearnset, [SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseTeachableLearnset, [SPECIES_DEOXYS_SPEED] = sDeoxysSpeedTeachableLearnset, #if P_GEN_4_POKEMON == TRUE -// Diamond and Pearl [SPECIES_TURTWIG] = sTurtwigTeachableLearnset, [SPECIES_GROTLE] = sGrotleTeachableLearnset, [SPECIES_TORTERRA] = sTorterraTeachableLearnset, @@ -464,13 +561,14 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CHERRIM_SUNSHINE] = sCherrimTeachableLearnset, [SPECIES_SHELLOS_WEST_SEA] = sShellosTeachableLearnset, [SPECIES_SHELLOS_EAST_SEA] = sShellosTeachableLearnset, - [SPECIES_GASTRODON] = sGastrodonTeachableLearnset, + [SPECIES_GASTRODON_WEST_SEA] = sGastrodonTeachableLearnset, [SPECIES_GASTRODON_EAST_SEA] = sGastrodonTeachableLearnset, [SPECIES_AMBIPOM] = sAmbipomTeachableLearnset, [SPECIES_DRIFLOON] = sDrifloonTeachableLearnset, [SPECIES_DRIFBLIM] = sDrifblimTeachableLearnset, [SPECIES_BUNEARY] = sBunearyTeachableLearnset, [SPECIES_LOPUNNY] = sLopunnyTeachableLearnset, + [SPECIES_LOPUNNY_MEGA] = sLopunnyTeachableLearnset, [SPECIES_MISMAGIUS] = sMismagiusTeachableLearnset, [SPECIES_HONCHKROW] = sHonchkrowTeachableLearnset, [SPECIES_GLAMEOW] = sGlameowTeachableLearnset, @@ -488,9 +586,11 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_GIBLE] = sGibleTeachableLearnset, [SPECIES_GABITE] = sGabiteTeachableLearnset, [SPECIES_GARCHOMP] = sGarchompTeachableLearnset, + [SPECIES_GARCHOMP_MEGA] = sGarchompTeachableLearnset, [SPECIES_MUNCHLAX] = sMunchlaxTeachableLearnset, [SPECIES_RIOLU] = sRioluTeachableLearnset, [SPECIES_LUCARIO] = sLucarioTeachableLearnset, + [SPECIES_LUCARIO_MEGA] = sLucarioTeachableLearnset, [SPECIES_HIPPOPOTAS] = sHippopotasTeachableLearnset, [SPECIES_HIPPOWDON] = sHippowdonTeachableLearnset, [SPECIES_SKORUPI] = sSkorupiTeachableLearnset, @@ -503,6 +603,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MANTYKE] = sMantykeTeachableLearnset, [SPECIES_SNOVER] = sSnoverTeachableLearnset, [SPECIES_ABOMASNOW] = sAbomasnowTeachableLearnset, + [SPECIES_ABOMASNOW_MEGA] = sAbomasnowTeachableLearnset, [SPECIES_WEAVILE] = sWeavileTeachableLearnset, [SPECIES_MAGNEZONE] = sMagnezoneTeachableLearnset, [SPECIES_LICKILICKY] = sLickilickyTeachableLearnset, @@ -518,23 +619,33 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MAMOSWINE] = sMamoswineTeachableLearnset, [SPECIES_PORYGON_Z] = sPorygonZTeachableLearnset, [SPECIES_GALLADE] = sGalladeTeachableLearnset, + [SPECIES_GALLADE_MEGA] = sGalladeTeachableLearnset, [SPECIES_PROBOPASS] = sProbopassTeachableLearnset, [SPECIES_DUSKNOIR] = sDusknoirTeachableLearnset, [SPECIES_FROSLASS] = sFroslassTeachableLearnset, [SPECIES_ROTOM] = sRotomTeachableLearnset, + [SPECIES_ROTOM_HEAT] = sRotomTeachableLearnset, + [SPECIES_ROTOM_WASH] = sRotomTeachableLearnset, + [SPECIES_ROTOM_FROST] = sRotomTeachableLearnset, + [SPECIES_ROTOM_FAN] = sRotomTeachableLearnset, + [SPECIES_ROTOM_MOW] = sRotomTeachableLearnset, [SPECIES_UXIE] = sUxieTeachableLearnset, [SPECIES_MESPRIT] = sMespritTeachableLearnset, [SPECIES_AZELF] = sAzelfTeachableLearnset, [SPECIES_DIALGA] = sDialgaTeachableLearnset, + [SPECIES_DIALGA_ORIGIN] = sDialgaTeachableLearnset, [SPECIES_PALKIA] = sPalkiaTeachableLearnset, + [SPECIES_PALKIA_ORIGIN] = sPalkiaTeachableLearnset, [SPECIES_HEATRAN] = sHeatranTeachableLearnset, [SPECIES_REGIGIGAS] = sRegigigasTeachableLearnset, [SPECIES_GIRATINA_ALTERED] = sGiratinaTeachableLearnset, + [SPECIES_GIRATINA_ORIGIN] = sGiratinaTeachableLearnset, [SPECIES_CRESSELIA] = sCresseliaTeachableLearnset, [SPECIES_PHIONE] = sPhioneTeachableLearnset, [SPECIES_MANAPHY] = sManaphyTeachableLearnset, [SPECIES_DARKRAI] = sDarkraiTeachableLearnset, [SPECIES_SHAYMIN_LAND] = sShayminTeachableLearnset, + [SPECIES_SHAYMIN_SKY] = sShayminSkyTeachableLearnset, [SPECIES_ARCEUS_NORMAL] = sArceusTeachableLearnset, [SPECIES_ARCEUS_FIGHTING] = sArceusTeachableLearnset, [SPECIES_ARCEUS_FLYING] = sArceusTeachableLearnset, @@ -552,20 +663,9 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ARCEUS_ICE] = sArceusTeachableLearnset, [SPECIES_ARCEUS_DRAGON] = sArceusTeachableLearnset, [SPECIES_ARCEUS_DARK] = sArceusTeachableLearnset, -// Platinum - [SPECIES_ROTOM_HEAT] = sRotomTeachableLearnset, - [SPECIES_ROTOM_WASH] = sRotomTeachableLearnset, - [SPECIES_ROTOM_FROST] = sRotomTeachableLearnset, - [SPECIES_ROTOM_FAN] = sRotomTeachableLearnset, - [SPECIES_ROTOM_MOW] = sRotomTeachableLearnset, - [SPECIES_GIRATINA_ORIGIN] = sGiratinaTeachableLearnset, - [SPECIES_SHAYMIN_SKY] = sShayminSkyTeachableLearnset, + [SPECIES_ARCEUS_FAIRY] = sArceusTeachableLearnset, #endif -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = sPichuTeachableLearnset, - #if P_GEN_5_POKEMON == TRUE -// Black and White [SPECIES_VICTINI] = sVictiniTeachableLearnset, [SPECIES_SNIVY] = sSnivyTeachableLearnset, [SPECIES_SERVINE] = sServineTeachableLearnset, @@ -576,6 +676,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_OSHAWOTT] = sOshawottTeachableLearnset, [SPECIES_DEWOTT] = sDewottTeachableLearnset, [SPECIES_SAMUROTT] = sSamurottTeachableLearnset, + [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianTeachableLearnset, [SPECIES_PATRAT] = sPatratTeachableLearnset, [SPECIES_WATCHOG] = sWatchogTeachableLearnset, [SPECIES_LILLIPUP] = sLillipupTeachableLearnset, @@ -604,6 +705,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DRILBUR] = sDrilburTeachableLearnset, [SPECIES_EXCADRILL] = sExcadrillTeachableLearnset, [SPECIES_AUDINO] = sAudinoTeachableLearnset, + [SPECIES_AUDINO_MEGA] = sAudinoTeachableLearnset, [SPECIES_TIMBURR] = sTimburrTeachableLearnset, [SPECIES_GURDURR] = sGurdurrTeachableLearnset, [SPECIES_CONKELDURR] = sConkeldurrTeachableLearnset, @@ -622,14 +724,19 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_WHIMSICOTT] = sWhimsicottTeachableLearnset, [SPECIES_PETILIL] = sPetililTeachableLearnset, [SPECIES_LILLIGANT] = sLilligantTeachableLearnset, + [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianTeachableLearnset, [SPECIES_BASCULIN_RED_STRIPED] = sBasculinTeachableLearnset, [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinTeachableLearnset, + [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinTeachableLearnset, [SPECIES_SANDILE] = sSandileTeachableLearnset, [SPECIES_KROKOROK] = sKrokorokTeachableLearnset, [SPECIES_KROOKODILE] = sKrookodileTeachableLearnset, [SPECIES_DARUMAKA] = sDarumakaTeachableLearnset, - [SPECIES_DARMANITAN] = sDarmanitanTeachableLearnset, + [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianTeachableLearnset, + [SPECIES_DARMANITAN_STANDARD_MODE] = sDarmanitanTeachableLearnset, [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanTeachableLearnset, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = sDarmanitanGalarianTeachableLearnset, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanGalarianTeachableLearnset, [SPECIES_MARACTUS] = sMaractusTeachableLearnset, [SPECIES_DWEBBLE] = sDwebbleTeachableLearnset, [SPECIES_CRUSTLE] = sCrustleTeachableLearnset, @@ -637,6 +744,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SCRAFTY] = sScraftyTeachableLearnset, [SPECIES_SIGILYPH] = sSigilyphTeachableLearnset, [SPECIES_YAMASK] = sYamaskTeachableLearnset, + [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianTeachableLearnset, [SPECIES_COFAGRIGUS] = sCofagrigusTeachableLearnset, [SPECIES_TIRTOUGA] = sTirtougaTeachableLearnset, [SPECIES_CARRACOSTA] = sCarracostaTeachableLearnset, @@ -645,7 +753,9 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_TRUBBISH] = sTrubbishTeachableLearnset, [SPECIES_GARBODOR] = sGarbodorTeachableLearnset, [SPECIES_ZORUA] = sZoruaTeachableLearnset, + [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianTeachableLearnset, [SPECIES_ZOROARK] = sZoroarkTeachableLearnset, + [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianTeachableLearnset, [SPECIES_MINCCINO] = sMinccinoTeachableLearnset, [SPECIES_CINCCINO] = sCinccinoTeachableLearnset, [SPECIES_GOTHITA] = sGothitaTeachableLearnset, @@ -659,11 +769,11 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_VANILLITE] = sVanilliteTeachableLearnset, [SPECIES_VANILLISH] = sVanillishTeachableLearnset, [SPECIES_VANILLUXE] = sVanilluxeTeachableLearnset, - [SPECIES_DEERLING] = sDeerlingTeachableLearnset, + [SPECIES_DEERLING_SPRING] = sDeerlingTeachableLearnset, [SPECIES_DEERLING_SUMMER] = sDeerlingTeachableLearnset, [SPECIES_DEERLING_AUTUMN] = sDeerlingTeachableLearnset, [SPECIES_DEERLING_WINTER] = sDeerlingTeachableLearnset, - [SPECIES_SAWSBUCK] = sSawsbuckTeachableLearnset, + [SPECIES_SAWSBUCK_SPRING] = sSawsbuckTeachableLearnset, [SPECIES_SAWSBUCK_SUMMER] = sSawsbuckTeachableLearnset, [SPECIES_SAWSBUCK_AUTUMN] = sSawsbuckTeachableLearnset, [SPECIES_SAWSBUCK_WINTER] = sSawsbuckTeachableLearnset, @@ -699,6 +809,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SHELMET] = sShelmetTeachableLearnset, [SPECIES_ACCELGOR] = sAccelgorTeachableLearnset, [SPECIES_STUNFISK] = sStunfiskTeachableLearnset, + [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianTeachableLearnset, [SPECIES_MIENFOO] = sMienfooTeachableLearnset, [SPECIES_MIENSHAO] = sMienshaoTeachableLearnset, [SPECIES_DRUDDIGON] = sDruddigonTeachableLearnset, @@ -709,6 +820,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_BOUFFALANT] = sBouffalantTeachableLearnset, [SPECIES_RUFFLET] = sRuffletTeachableLearnset, [SPECIES_BRAVIARY] = sBraviaryTeachableLearnset, + [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianTeachableLearnset, [SPECIES_VULLABY] = sVullabyTeachableLearnset, [SPECIES_MANDIBUZZ] = sMandibuzzTeachableLearnset, [SPECIES_HEATMOR] = sHeatmorTeachableLearnset, @@ -721,30 +833,28 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_COBALION] = sCobalionTeachableLearnset, [SPECIES_TERRAKION] = sTerrakionTeachableLearnset, [SPECIES_VIRIZION] = sVirizionTeachableLearnset, - [SPECIES_TORNADUS] = sTornadusTeachableLearnset, - [SPECIES_THUNDURUS] = sThundurusTeachableLearnset, + [SPECIES_TORNADUS_INCARNATE] = sTornadusTeachableLearnset, + [SPECIES_TORNADUS_THERIAN] = sTornadusTeachableLearnset, + [SPECIES_THUNDURUS_INCARNATE] = sThundurusTeachableLearnset, + [SPECIES_THUNDURUS_THERIAN] = sThundurusTeachableLearnset, [SPECIES_RESHIRAM] = sReshiramTeachableLearnset, [SPECIES_ZEKROM] = sZekromTeachableLearnset, - [SPECIES_LANDORUS] = sLandorusTeachableLearnset, + [SPECIES_LANDORUS_INCARNATE] = sLandorusTeachableLearnset, + [SPECIES_LANDORUS_THERIAN] = sLandorusTeachableLearnset, [SPECIES_KYUREM] = sKyuremTeachableLearnset, - [SPECIES_KELDEO] = sKeldeoTeachableLearnset, - [SPECIES_MELOETTA] = sMeloettaTeachableLearnset, + [SPECIES_KYUREM_WHITE] = sKyuremTeachableLearnset, + [SPECIES_KYUREM_BLACK] = sKyuremTeachableLearnset, + [SPECIES_KELDEO_ORDINARY] = sKeldeoTeachableLearnset, + [SPECIES_KELDEO_RESOLUTE] = sKeldeoTeachableLearnset, + [SPECIES_MELOETTA_ARIA] = sMeloettaTeachableLearnset, [SPECIES_MELOETTA_PIROUETTE] = sMeloettaTeachableLearnset, [SPECIES_GENESECT] = sGenesectTeachableLearnset, [SPECIES_GENESECT_DOUSE_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectTeachableLearnset, -// Black 2 and White 2 - [SPECIES_TORNADUS_THERIAN] = sTornadusTeachableLearnset, - [SPECIES_THUNDURUS_THERIAN] = sThundurusTeachableLearnset, - [SPECIES_LANDORUS_THERIAN] = sLandorusTeachableLearnset, - [SPECIES_KYUREM_WHITE] = sKyuremTeachableLearnset, - [SPECIES_KYUREM_BLACK] = sKyuremTeachableLearnset, - [SPECIES_KELDEO_RESOLUTE] = sKeldeoTeachableLearnset, #endif #if P_GEN_6_POKEMON == TRUE -// X and Y [SPECIES_CHESPIN] = sChespinTeachableLearnset, [SPECIES_QUILLADIN] = sQuilladinTeachableLearnset, [SPECIES_CHESNAUGHT] = sChesnaughtTeachableLearnset, @@ -754,6 +864,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_FROAKIE] = sFroakieTeachableLearnset, [SPECIES_FROGADIER] = sFrogadierTeachableLearnset, [SPECIES_GRENINJA] = sGreninjaTeachableLearnset, + [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaTeachableLearnset, + [SPECIES_GRENINJA_ASH] = sGreninjaTeachableLearnset, [SPECIES_BUNNELBY] = sBunnelbyTeachableLearnset, [SPECIES_DIGGERSBY] = sDiggersbyTeachableLearnset, [SPECIES_FLETCHLING] = sFletchlingTeachableLearnset, @@ -761,22 +873,65 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_TALONFLAME] = sTalonflameTeachableLearnset, [SPECIES_SCATTERBUG] = sScatterbugTeachableLearnset, [SPECIES_SPEWPA] = sSpewpaTeachableLearnset, - [SPECIES_VIVILLON] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_ICY_SNOW] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_POLAR] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_TUNDRA] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_CONTINENTAL] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_GARDEN] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_ELEGANT] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_MEADOW] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_MODERN] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_MARINE] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_ARCHIPELAGO] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_HIGH_PLAINS] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_SANDSTORM] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_RIVER] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_MONSOON] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_SAVANNA] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_SUN] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_OCEAN] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_JUNGLE] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_FANCY] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_POKE_BALL] = sVivillonTeachableLearnset, [SPECIES_LITLEO] = sLitleoTeachableLearnset, [SPECIES_PYROAR] = sPyroarTeachableLearnset, - [SPECIES_FLABEBE] = sFlabebeTeachableLearnset, - [SPECIES_FLOETTE] = sFloetteTeachableLearnset, - [SPECIES_FLORGES] = sFlorgesTeachableLearnset, + [SPECIES_FLABEBE_RED_FLOWER] = sFlabebeTeachableLearnset, + [SPECIES_FLABEBE_YELLOW_FLOWER] = sFlabebeTeachableLearnset, + [SPECIES_FLABEBE_ORANGE_FLOWER] = sFlabebeTeachableLearnset, + [SPECIES_FLABEBE_BLUE_FLOWER] = sFlabebeTeachableLearnset, + [SPECIES_FLABEBE_WHITE_FLOWER] = sFlabebeTeachableLearnset, + [SPECIES_FLOETTE_RED_FLOWER] = sFloetteTeachableLearnset, + [SPECIES_FLOETTE_YELLOW_FLOWER] = sFloetteTeachableLearnset, + [SPECIES_FLOETTE_ORANGE_FLOWER] = sFloetteTeachableLearnset, + [SPECIES_FLOETTE_BLUE_FLOWER] = sFloetteTeachableLearnset, + [SPECIES_FLOETTE_WHITE_FLOWER] = sFloetteTeachableLearnset, + [SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteEternalFlowerTeachableLearnset, + [SPECIES_FLORGES_RED_FLOWER] = sFlorgesTeachableLearnset, + [SPECIES_FLORGES_YELLOW_FLOWER] = sFlorgesTeachableLearnset, + [SPECIES_FLORGES_ORANGE_FLOWER] = sFlorgesTeachableLearnset, + [SPECIES_FLORGES_BLUE_FLOWER] = sFlorgesTeachableLearnset, + [SPECIES_FLORGES_WHITE_FLOWER] = sFlorgesTeachableLearnset, [SPECIES_SKIDDO] = sSkiddoTeachableLearnset, [SPECIES_GOGOAT] = sGogoatTeachableLearnset, [SPECIES_PANCHAM] = sPanchamTeachableLearnset, [SPECIES_PANGORO] = sPangoroTeachableLearnset, - [SPECIES_FURFROU] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_NATURAL] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_HEART_TRIM] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_STAR_TRIM] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_DIAMOND_TRIM] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_DEBUTANTE_TRIM] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_MATRON_TRIM] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_DANDY_TRIM] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_LA_REINE_TRIM] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_KABUKI_TRIM] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_PHARAOH_TRIM] = sFurfrouTeachableLearnset, [SPECIES_ESPURR] = sEspurrTeachableLearnset, - [SPECIES_MEOWSTIC] = sMeowsticTeachableLearnset, + [SPECIES_MEOWSTIC_MALE] = sMeowsticTeachableLearnset, + [SPECIES_MEOWSTIC_FEMALE] = sMeowsticFemaleTeachableLearnset, [SPECIES_HONEDGE] = sHonedgeTeachableLearnset, [SPECIES_DOUBLADE] = sDoubladeTeachableLearnset, - [SPECIES_AEGISLASH] = sAegislashTeachableLearnset, + [SPECIES_AEGISLASH_SHIELD] = sAegislashTeachableLearnset, + [SPECIES_AEGISLASH_BLADE] = sAegislashTeachableLearnset, [SPECIES_SPRITZEE] = sSpritzeeTeachableLearnset, [SPECIES_AROMATISSE] = sAromatisseTeachableLearnset, [SPECIES_SWIRLIX] = sSwirlixTeachableLearnset, @@ -801,27 +956,44 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CARBINK] = sCarbinkTeachableLearnset, [SPECIES_GOOMY] = sGoomyTeachableLearnset, [SPECIES_SLIGGOO] = sSliggooTeachableLearnset, + [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianTeachableLearnset, [SPECIES_GOODRA] = sGoodraTeachableLearnset, + [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianTeachableLearnset, [SPECIES_KLEFKI] = sKlefkiTeachableLearnset, [SPECIES_PHANTUMP] = sPhantumpTeachableLearnset, [SPECIES_TREVENANT] = sTrevenantTeachableLearnset, - [SPECIES_PUMPKABOO] = sPumpkabooTeachableLearnset, - [SPECIES_GOURGEIST] = sGourgeistTeachableLearnset, + [SPECIES_PUMPKABOO_AVERAGE] = sPumpkabooTeachableLearnset, + [SPECIES_PUMPKABOO_SMALL] = sPumpkabooTeachableLearnset, + [SPECIES_PUMPKABOO_LARGE] = sPumpkabooTeachableLearnset, + [SPECIES_PUMPKABOO_SUPER] = sPumpkabooTeachableLearnset, + [SPECIES_GOURGEIST_AVERAGE] = sGourgeistTeachableLearnset, + [SPECIES_GOURGEIST_SMALL] = sGourgeistTeachableLearnset, + [SPECIES_GOURGEIST_LARGE] = sGourgeistTeachableLearnset, + [SPECIES_GOURGEIST_SUPER] = sGourgeistTeachableLearnset, [SPECIES_BERGMITE] = sBergmiteTeachableLearnset, [SPECIES_AVALUGG] = sAvaluggTeachableLearnset, + [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianTeachableLearnset, [SPECIES_NOIBAT] = sNoibatTeachableLearnset, [SPECIES_NOIVERN] = sNoivernTeachableLearnset, - [SPECIES_XERNEAS] = sXerneasTeachableLearnset, + [SPECIES_XERNEAS_NEUTRAL] = sXerneasTeachableLearnset, + [SPECIES_XERNEAS_ACTIVE] = sXerneasTeachableLearnset, [SPECIES_YVELTAL] = sYveltalTeachableLearnset, - [SPECIES_ZYGARDE] = sZygardeTeachableLearnset, + [SPECIES_ZYGARDE_50] = sZygardeTeachableLearnset, + [SPECIES_ZYGARDE_10] = sZygardeTeachableLearnset, + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardeTeachableLearnset, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardeTeachableLearnset, + [SPECIES_ZYGARDE_COMPLETE] = sZygardeTeachableLearnset, [SPECIES_DIANCIE] = sDiancieTeachableLearnset, - [SPECIES_HOOPA] = sHoopaTeachableLearnset, + [SPECIES_DIANCIE_MEGA] = sDiancieTeachableLearnset, + [SPECIES_HOOPA_CONFINED] = sHoopaTeachableLearnset, + [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundTeachableLearnset, [SPECIES_VOLCANION] = sVolcanionTeachableLearnset, #endif #if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = sRowletTeachableLearnset, [SPECIES_DARTRIX] = sDartrixTeachableLearnset, [SPECIES_DECIDUEYE] = sDecidueyeTeachableLearnset, + [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset, [SPECIES_LITTEN] = sLittenTeachableLearnset, [SPECIES_TORRACAT] = sTorracatTeachableLearnset, [SPECIES_INCINEROAR] = sIncineroarTeachableLearnset, @@ -838,12 +1010,19 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_VIKAVOLT] = sVikavoltTeachableLearnset, [SPECIES_CRABRAWLER] = sCrabrawlerTeachableLearnset, [SPECIES_CRABOMINABLE] = sCrabominableTeachableLearnset, - [SPECIES_ORICORIO] = sOricorioTeachableLearnset, + [SPECIES_ORICORIO_BAILE] = sOricorioTeachableLearnset, + [SPECIES_ORICORIO_POM_POM] = sOricorioTeachableLearnset, + [SPECIES_ORICORIO_PAU] = sOricorioTeachableLearnset, + [SPECIES_ORICORIO_SENSU] = sOricorioTeachableLearnset, [SPECIES_CUTIEFLY] = sCutieflyTeachableLearnset, [SPECIES_RIBOMBEE] = sRibombeeTeachableLearnset, [SPECIES_ROCKRUFF] = sRockruffTeachableLearnset, - [SPECIES_LYCANROC] = sLycanrocTeachableLearnset, - [SPECIES_WISHIWASHI] = sWishiwashiTeachableLearnset, + [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffTeachableLearnset, + [SPECIES_LYCANROC_MIDDAY] = sLycanrocTeachableLearnset, + [SPECIES_LYCANROC_MIDNIGHT] = sLycanrocMidnightTeachableLearnset, + [SPECIES_LYCANROC_DUSK] = sLycanrocDuskTeachableLearnset, + [SPECIES_WISHIWASHI_SOLO] = sWishiwashiTeachableLearnset, + [SPECIES_WISHIWASHI_SCHOOL] = sWishiwashiTeachableLearnset, [SPECIES_MAREANIE] = sMareanieTeachableLearnset, [SPECIES_TOXAPEX] = sToxapexTeachableLearnset, [SPECIES_MUDBRAY] = sMudbrayTeachableLearnset, @@ -870,12 +1049,43 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_PALOSSAND] = sPalossandTeachableLearnset, [SPECIES_PYUKUMUKU] = sPyukumukuTeachableLearnset, [SPECIES_TYPE_NULL] = sTypeNullTeachableLearnset, - [SPECIES_SILVALLY] = sSilvallyTeachableLearnset, - [SPECIES_MINIOR] = sMiniorTeachableLearnset, + [SPECIES_SILVALLY_NORMAL] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_FIGHTING] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_FLYING] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_POISON] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_GROUND] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_ROCK] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_BUG] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_GHOST] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_STEEL] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_FIRE] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_WATER] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_GRASS] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_ELECTRIC] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_PSYCHIC] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_ICE] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_DRAGON] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_DARK] = sSilvallyTeachableLearnset, + [SPECIES_SILVALLY_FAIRY] = sSilvallyTeachableLearnset, + [SPECIES_MINIOR_METEOR_RED] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_METEOR_ORANGE] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_METEOR_YELLOW] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_METEOR_GREEN] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_METEOR_BLUE] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_METEOR_INDIGO] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_METEOR_VIOLET] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_CORE_RED] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_CORE_ORANGE] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_CORE_YELLOW] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_CORE_GREEN] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_CORE_BLUE] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_CORE_INDIGO] = sMiniorTeachableLearnset, + [SPECIES_MINIOR_CORE_VIOLET] = sMiniorTeachableLearnset, [SPECIES_KOMALA] = sKomalaTeachableLearnset, [SPECIES_TURTONATOR] = sTurtonatorTeachableLearnset, [SPECIES_TOGEDEMARU] = sTogedemaruTeachableLearnset, - [SPECIES_MIMIKYU] = sMimikyuTeachableLearnset, + [SPECIES_MIMIKYU_DISGUISED] = sMimikyuTeachableLearnset, + [SPECIES_MIMIKYU_BUSTED] = sMimikyuTeachableLearnset, [SPECIES_BRUXISH] = sBruxishTeachableLearnset, [SPECIES_DRAMPA] = sDrampaTeachableLearnset, [SPECIES_DHELMISE] = sDhelmiseTeachableLearnset, @@ -898,7 +1108,11 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_KARTANA] = sKartanaTeachableLearnset, [SPECIES_GUZZLORD] = sGuzzlordTeachableLearnset, [SPECIES_NECROZMA] = sNecrozmaTeachableLearnset, + [SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaTeachableLearnset, + [SPECIES_NECROZMA_DAWN_WINGS] = sNecrozmaTeachableLearnset, + [SPECIES_NECROZMA_ULTRA] = sNecrozmaTeachableLearnset, [SPECIES_MAGEARNA] = sMagearnaTeachableLearnset, + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaTeachableLearnset, [SPECIES_MARSHADOW] = sMarshadowTeachableLearnset, [SPECIES_POIPOLE] = sPoipoleTeachableLearnset, [SPECIES_NAGANADEL] = sNaganadelTeachableLearnset, @@ -945,16 +1159,21 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SILICOBRA] = sSilicobraTeachableLearnset, [SPECIES_SANDACONDA] = sSandacondaTeachableLearnset, [SPECIES_CRAMORANT] = sCramorantTeachableLearnset, + [SPECIES_CRAMORANT_GULPING] = sCramorantTeachableLearnset, + [SPECIES_CRAMORANT_GORGING] = sCramorantTeachableLearnset, [SPECIES_ARROKUDA] = sArrokudaTeachableLearnset, [SPECIES_BARRASKEWDA] = sBarraskewdaTeachableLearnset, [SPECIES_TOXEL] = sToxelTeachableLearnset, - [SPECIES_TOXTRICITY] = sToxtricityTeachableLearnset, + [SPECIES_TOXTRICITY_AMPED] = sToxtricityTeachableLearnset, + [SPECIES_TOXTRICITY_LOW_KEY] = sToxtricityLowKeyTeachableLearnset, [SPECIES_SIZZLIPEDE] = sSizzlipedeTeachableLearnset, [SPECIES_CENTISKORCH] = sCentiskorchTeachableLearnset, [SPECIES_CLOBBOPUS] = sClobbopusTeachableLearnset, [SPECIES_GRAPPLOCT] = sGrapploctTeachableLearnset, - [SPECIES_SINISTEA] = sSinisteaTeachableLearnset, - [SPECIES_POLTEAGEIST] = sPolteageistTeachableLearnset, + [SPECIES_SINISTEA_PHONY] = sSinisteaTeachableLearnset, + [SPECIES_SINISTEA_ANTIQUE] = sSinisteaTeachableLearnset, + [SPECIES_POLTEAGEIST_PHONY] = sPolteageistTeachableLearnset, + [SPECIES_POLTEAGEIST_ANTIQUE] = sPolteageistTeachableLearnset, [SPECIES_HATENNA] = sHatennaTeachableLearnset, [SPECIES_HATTREM] = sHattremTeachableLearnset, [SPECIES_HATTERENE] = sHattereneTeachableLearnset, @@ -968,15 +1187,26 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MR_RIME] = sMrRimeTeachableLearnset, [SPECIES_RUNERIGUS] = sRunerigusTeachableLearnset, [SPECIES_MILCERY] = sMilceryTeachableLearnset, - [SPECIES_ALCREMIE] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAlcremieTeachableLearnset, [SPECIES_FALINKS] = sFalinksTeachableLearnset, [SPECIES_PINCURCHIN] = sPincurchinTeachableLearnset, [SPECIES_SNOM] = sSnomTeachableLearnset, [SPECIES_FROSMOTH] = sFrosmothTeachableLearnset, [SPECIES_STONJOURNER] = sStonjournerTeachableLearnset, - [SPECIES_EISCUE] = sEiscueTeachableLearnset, - [SPECIES_INDEEDEE] = sIndeedeeTeachableLearnset, - [SPECIES_MORPEKO] = sMorpekoTeachableLearnset, + [SPECIES_EISCUE_ICE_FACE] = sEiscueTeachableLearnset, + [SPECIES_EISCUE_NOICE_FACE] = sEiscueTeachableLearnset, + [SPECIES_INDEEDEE_MALE] = sIndeedeeTeachableLearnset, + [SPECIES_INDEEDEE_FEMALE] = sIndeedeeFemaleTeachableLearnset, + [SPECIES_MORPEKO_FULL_BELLY] = sMorpekoTeachableLearnset, + [SPECIES_MORPEKO_HANGRY] = sMorpekoTeachableLearnset, [SPECIES_CUFANT] = sCufantTeachableLearnset, [SPECIES_COPPERAJAH] = sCopperajahTeachableLearnset, [SPECIES_DRACOZOLT] = sDracozoltTeachableLearnset, @@ -987,341 +1217,31 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DREEPY] = sDreepyTeachableLearnset, [SPECIES_DRAKLOAK] = sDrakloakTeachableLearnset, [SPECIES_DRAGAPULT] = sDragapultTeachableLearnset, - [SPECIES_ZACIAN] = sZacianTeachableLearnset, - [SPECIES_ZAMAZENTA] = sZamazentaTeachableLearnset, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sZacianTeachableLearnset, + [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianTeachableLearnset, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaTeachableLearnset, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaTeachableLearnset, [SPECIES_ETERNATUS] = sEternatusTeachableLearnset, + [SPECIES_ETERNATUS_ETERNAMAX] = sEternatusTeachableLearnset, [SPECIES_KUBFU] = sKubfuTeachableLearnset, - [SPECIES_URSHIFU] = sUrshifuTeachableLearnset, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = sUrshifuTeachableLearnset, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = sUrshifuRapidStrikeStyleTeachableLearnset, [SPECIES_ZARUDE] = sZarudeTeachableLearnset, + [SPECIES_ZARUDE_DADA] = sZarudeTeachableLearnset, [SPECIES_REGIELEKI] = sRegielekiTeachableLearnset, [SPECIES_REGIDRAGO] = sRegidragoTeachableLearnset, [SPECIES_GLASTRIER] = sGlastrierTeachableLearnset, [SPECIES_SPECTRIER] = sSpectrierTeachableLearnset, [SPECIES_CALYREX] = sCalyrexTeachableLearnset, + [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderTeachableLearnset, + [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderTeachableLearnset, [SPECIES_WYRDEER] = sWyrdeerTeachableLearnset, [SPECIES_KLEAVOR] = sKleavorTeachableLearnset, [SPECIES_URSALUNA] = sUrsalunaTeachableLearnset, [SPECIES_BASCULEGION] = sBasculegionTeachableLearnset, [SPECIES_SNEASLER] = sSneaslerTeachableLearnset, [SPECIES_OVERQWIL] = sOverqwilTeachableLearnset, - [SPECIES_ENAMORUS] = sEnamorusTeachableLearnset, -#endif - // Megas - [SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset, - [SPECIES_CHARIZARD_MEGA_X] = sCharizardTeachableLearnset, - [SPECIES_CHARIZARD_MEGA_Y] = sCharizardTeachableLearnset, - [SPECIES_BLASTOISE_MEGA] = sBlastoiseTeachableLearnset, - [SPECIES_BEEDRILL_MEGA] = sBeedrillTeachableLearnset, - [SPECIES_PIDGEOT_MEGA] = sPidgeotTeachableLearnset, - [SPECIES_ALAKAZAM_MEGA] = sAlakazamTeachableLearnset, - [SPECIES_SLOWBRO_MEGA] = sSlowbroTeachableLearnset, - [SPECIES_GENGAR_MEGA] = sGengarTeachableLearnset, - [SPECIES_KANGASKHAN_MEGA] = sKangaskhanTeachableLearnset, - [SPECIES_PINSIR_MEGA] = sPinsirTeachableLearnset, - [SPECIES_GYARADOS_MEGA] = sGyaradosTeachableLearnset, - [SPECIES_AERODACTYL_MEGA] = sAerodactylTeachableLearnset, - [SPECIES_MEWTWO_MEGA_X] = sMewtwoTeachableLearnset, - [SPECIES_MEWTWO_MEGA_Y] = sMewtwoTeachableLearnset, - [SPECIES_AMPHAROS_MEGA] = sAmpharosTeachableLearnset, - [SPECIES_STEELIX_MEGA] = sSteelixTeachableLearnset, - [SPECIES_SCIZOR_MEGA] = sScizorTeachableLearnset, - [SPECIES_HERACROSS_MEGA] = sHeracrossTeachableLearnset, - [SPECIES_HOUNDOOM_MEGA] = sHoundoomTeachableLearnset, - [SPECIES_TYRANITAR_MEGA] = sTyranitarTeachableLearnset, - [SPECIES_SCEPTILE_MEGA] = sSceptileTeachableLearnset, - [SPECIES_BLAZIKEN_MEGA] = sBlazikenTeachableLearnset, - [SPECIES_SWAMPERT_MEGA] = sSwampertTeachableLearnset, - [SPECIES_GARDEVOIR_MEGA] = sGardevoirTeachableLearnset, - [SPECIES_SABLEYE_MEGA] = sSableyeTeachableLearnset, - [SPECIES_MAWILE_MEGA] = sMawileTeachableLearnset, - [SPECIES_AGGRON_MEGA] = sAggronTeachableLearnset, - [SPECIES_MEDICHAM_MEGA] = sMedichamTeachableLearnset, - [SPECIES_MANECTRIC_MEGA] = sManectricTeachableLearnset, - [SPECIES_SHARPEDO_MEGA] = sSharpedoTeachableLearnset, - [SPECIES_CAMERUPT_MEGA] = sCameruptTeachableLearnset, - [SPECIES_ALTARIA_MEGA] = sAltariaTeachableLearnset, - [SPECIES_BANETTE_MEGA] = sBanetteTeachableLearnset, - [SPECIES_ABSOL_MEGA] = sAbsolTeachableLearnset, - [SPECIES_GLALIE_MEGA] = sGlalieTeachableLearnset, - [SPECIES_SALAMENCE_MEGA] = sSalamenceTeachableLearnset, - [SPECIES_METAGROSS_MEGA] = sMetagrossTeachableLearnset, - [SPECIES_LATIAS_MEGA] = sLatiasTeachableLearnset, - [SPECIES_LATIOS_MEGA] = sLatiosTeachableLearnset, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA] = sLopunnyTeachableLearnset, - [SPECIES_GARCHOMP_MEGA] = sGarchompTeachableLearnset, - [SPECIES_LUCARIO_MEGA] = sLucarioTeachableLearnset, - [SPECIES_ABOMASNOW_MEGA] = sAbomasnowTeachableLearnset, - [SPECIES_GALLADE_MEGA] = sGalladeTeachableLearnset, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA] = sAudinoTeachableLearnset, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA] = sDiancieTeachableLearnset, -#endif - // Special Mega + Primals - [SPECIES_RAYQUAZA_MEGA] = sRayquazaTeachableLearnset, - [SPECIES_KYOGRE_PRIMAL] = sKyogreTeachableLearnset, - [SPECIES_GROUDON_PRIMAL] = sGroudonTeachableLearnset, - // Alolan Forms - [SPECIES_RATTATA_ALOLAN] = sRattataAlolanTeachableLearnset, - [SPECIES_RATICATE_ALOLAN] = sRaticateAlolanTeachableLearnset, - [SPECIES_RAICHU_ALOLAN] = sRaichuAlolanTeachableLearnset, - [SPECIES_SANDSHREW_ALOLAN] = sSandshrewAlolanTeachableLearnset, - [SPECIES_SANDSLASH_ALOLAN] = sSandslashAlolanTeachableLearnset, - [SPECIES_VULPIX_ALOLAN] = sVulpixAlolanTeachableLearnset, - [SPECIES_NINETALES_ALOLAN] = sNinetalesAlolanTeachableLearnset, - [SPECIES_DIGLETT_ALOLAN] = sDiglettAlolanTeachableLearnset, - [SPECIES_DUGTRIO_ALOLAN] = sDugtrioAlolanTeachableLearnset, - [SPECIES_MEOWTH_ALOLAN] = sMeowthAlolanTeachableLearnset, - [SPECIES_PERSIAN_ALOLAN] = sPersianAlolanTeachableLearnset, - [SPECIES_GEODUDE_ALOLAN] = sGeodudeAlolanTeachableLearnset, - [SPECIES_GRAVELER_ALOLAN] = sGravelerAlolanTeachableLearnset, - [SPECIES_GOLEM_ALOLAN] = sGolemAlolanTeachableLearnset, - [SPECIES_GRIMER_ALOLAN] = sGrimerAlolanTeachableLearnset, - [SPECIES_MUK_ALOLAN] = sMukAlolanTeachableLearnset, - [SPECIES_EXEGGUTOR_ALOLAN] = sExeggutorAlolanTeachableLearnset, - [SPECIES_MAROWAK_ALOLAN] = sMarowakAlolanTeachableLearnset, - // Galarian Forms - [SPECIES_MEOWTH_GALARIAN] = sMeowthGalarianTeachableLearnset, - [SPECIES_PONYTA_GALARIAN] = sPonytaGalarianTeachableLearnset, - [SPECIES_RAPIDASH_GALARIAN] = sRapidashGalarianTeachableLearnset, - [SPECIES_SLOWPOKE_GALARIAN] = sSlowpokeGalarianTeachableLearnset, - [SPECIES_SLOWBRO_GALARIAN] = sSlowbroGalarianTeachableLearnset, - [SPECIES_FARFETCHD_GALARIAN] = sFarfetchdGalarianTeachableLearnset, - [SPECIES_WEEZING_GALARIAN] = sWeezingGalarianTeachableLearnset, - [SPECIES_MR_MIME_GALARIAN] = sMrMimeGalarianTeachableLearnset, - [SPECIES_ARTICUNO_GALARIAN] = sArticunoGalarianTeachableLearnset, - [SPECIES_ZAPDOS_GALARIAN] = sZapdosGalarianTeachableLearnset, - [SPECIES_MOLTRES_GALARIAN] = sMoltresGalarianTeachableLearnset, - [SPECIES_SLOWKING_GALARIAN] = sSlowkingGalarianTeachableLearnset, - [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianTeachableLearnset, - [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianTeachableLearnset, - [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianTeachableLearnset, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianTeachableLearnset, - [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianTeachableLearnset, - [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianTeachableLearnset, - [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianTeachableLearnset, -#endif - // Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianTeachableLearnset, - [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianTeachableLearnset, - [SPECIES_VOLTORB_HISUIAN] = sVoltorbHisuianTeachableLearnset, - [SPECIES_ELECTRODE_HISUIAN] = sElectrodeHisuianTeachableLearnset, - [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianTeachableLearnset, - [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianTeachableLearnset, - [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianTeachableLearnset, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianTeachableLearnset, - [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianTeachableLearnset, - [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianTeachableLearnset, - [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianTeachableLearnset, - [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianTeachableLearnset, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianTeachableLearnset, - [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianTeachableLearnset, - [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianTeachableLearnset, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset, -#endif - // Misc Forms - // Cosplay Pikachu - [SPECIES_PIKACHU_COSPLAY] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_ROCK_STAR] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_BELLE] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_POP_STAR] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_PH_D] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_LIBRE] = sPikachuTeachableLearnset, - // Cap Pikachu - [SPECIES_PIKACHU_ORIGINAL_CAP] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_HOENN_CAP] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_SINNOH_CAP] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_UNOVA_CAP] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_KALOS_CAP] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_ALOLA_CAP] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_PARTNER_CAP] = sPikachuTeachableLearnset, - [SPECIES_PIKACHU_WORLD_CAP] = sPikachuTeachableLearnset, -#if P_GEN_4_POKEMON == TRUE - // Origin Forme - [SPECIES_DIALGA_ORIGIN] = sDialgaTeachableLearnset, - [SPECIES_PALKIA_ORIGIN] = sPalkiaTeachableLearnset, - // Arceus - [SPECIES_ARCEUS_FAIRY] = sArceusTeachableLearnset, -#endif -#if P_GEN_5_POKEMON == TRUE - - [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinTeachableLearnset, - // Darmanitan - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanGalarianTeachableLearnset, -#endif -#if P_GEN_6_POKEMON == TRUE - // Greninja - [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaTeachableLearnset, - [SPECIES_GRENINJA_ASH] = sGreninjaTeachableLearnset, - // Vivillon - [SPECIES_VIVILLON_POLAR] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_TUNDRA] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_CONTINENTAL] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_GARDEN] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_ELEGANT] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_MEADOW] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_MODERN] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_MARINE] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_ARCHIPELAGO] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_HIGH_PLAINS] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_SANDSTORM] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_RIVER] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_MONSOON] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_SAVANNA] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_SUN] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_OCEAN] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_JUNGLE] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_FANCY] = sVivillonTeachableLearnset, - [SPECIES_VIVILLON_POKE_BALL] = sVivillonTeachableLearnset, - // Flabébé - [SPECIES_FLABEBE_YELLOW_FLOWER] = sFlabebeTeachableLearnset, - [SPECIES_FLABEBE_ORANGE_FLOWER] = sFlabebeTeachableLearnset, - [SPECIES_FLABEBE_BLUE_FLOWER] = sFlabebeTeachableLearnset, - [SPECIES_FLABEBE_WHITE_FLOWER] = sFlabebeTeachableLearnset, - // Floette - [SPECIES_FLOETTE_YELLOW_FLOWER] = sFloetteTeachableLearnset, - [SPECIES_FLOETTE_ORANGE_FLOWER] = sFloetteTeachableLearnset, - [SPECIES_FLOETTE_BLUE_FLOWER] = sFloetteTeachableLearnset, - [SPECIES_FLOETTE_WHITE_FLOWER] = sFloetteTeachableLearnset, - [SPECIES_FLOETTE_ETERNAL_FLOWER] = sFloetteEternalFlowerTeachableLearnset, - // Florges - [SPECIES_FLORGES_YELLOW_FLOWER] = sFlorgesTeachableLearnset, - [SPECIES_FLORGES_ORANGE_FLOWER] = sFlorgesTeachableLearnset, - [SPECIES_FLORGES_BLUE_FLOWER] = sFlorgesTeachableLearnset, - [SPECIES_FLORGES_WHITE_FLOWER] = sFlorgesTeachableLearnset, - //Furfrou - [SPECIES_FURFROU_HEART_TRIM] = sFurfrouTeachableLearnset, - [SPECIES_FURFROU_STAR_TRIM] = sFurfrouTeachableLearnset, - [SPECIES_FURFROU_DIAMOND_TRIM] = sFurfrouTeachableLearnset, - [SPECIES_FURFROU_DEBUTANTE_TRIM] = sFurfrouTeachableLearnset, - [SPECIES_FURFROU_MATRON_TRIM] = sFurfrouTeachableLearnset, - [SPECIES_FURFROU_DANDY_TRIM] = sFurfrouTeachableLearnset, - [SPECIES_FURFROU_LA_REINE_TRIM] = sFurfrouTeachableLearnset, - [SPECIES_FURFROU_KABUKI_TRIM] = sFurfrouTeachableLearnset, - [SPECIES_FURFROU_PHARAOH_TRIM] = sFurfrouTeachableLearnset, - // Meowstic - [SPECIES_MEOWSTIC_FEMALE] = sMeowsticFemaleTeachableLearnset, - // Aegislash - [SPECIES_AEGISLASH_BLADE] = sAegislashTeachableLearnset, - // Pumpkaboo - [SPECIES_PUMPKABOO_SMALL] = sPumpkabooTeachableLearnset, - [SPECIES_PUMPKABOO_LARGE] = sPumpkabooTeachableLearnset, - [SPECIES_PUMPKABOO_SUPER] = sPumpkabooTeachableLearnset, - // Gourgeist - [SPECIES_GOURGEIST_SMALL] = sGourgeistTeachableLearnset, - [SPECIES_GOURGEIST_LARGE] = sGourgeistTeachableLearnset, - [SPECIES_GOURGEIST_SUPER] = sGourgeistTeachableLearnset, - // Xerneas - [SPECIES_XERNEAS_ACTIVE] = sXerneasTeachableLearnset, - // Zygarde - [SPECIES_ZYGARDE_10] = sZygardeTeachableLearnset, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardeTeachableLearnset, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardeTeachableLearnset, - [SPECIES_ZYGARDE_COMPLETE] = sZygardeTeachableLearnset, - // Hoopa - [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundTeachableLearnset, -#endif -#if P_GEN_7_POKEMON == TRUE - // Oricorio - [SPECIES_ORICORIO_POM_POM] = sOricorioTeachableLearnset, - [SPECIES_ORICORIO_PAU] = sOricorioTeachableLearnset, - [SPECIES_ORICORIO_SENSU] = sOricorioTeachableLearnset, - // Rockruff - [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffTeachableLearnset, - // Lycanroc - [SPECIES_LYCANROC_MIDNIGHT] = sLycanrocMidnightTeachableLearnset, - [SPECIES_LYCANROC_DUSK] = sLycanrocDuskTeachableLearnset, - // Wishiwashi - [SPECIES_WISHIWASHI_SCHOOL] = sWishiwashiTeachableLearnset, - // Silvally - [SPECIES_SILVALLY_FIGHTING] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_FLYING] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_POISON] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_GROUND] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_ROCK] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_BUG] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_GHOST] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_STEEL] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_FIRE] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_WATER] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_GRASS] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_ELECTRIC] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_PSYCHIC] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_ICE] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_DRAGON] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_DARK] = sSilvallyTeachableLearnset, - [SPECIES_SILVALLY_FAIRY] = sSilvallyTeachableLearnset, - // Minior - [SPECIES_MINIOR_METEOR_ORANGE] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_METEOR_YELLOW] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_METEOR_GREEN] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_METEOR_BLUE] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_METEOR_INDIGO] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_METEOR_VIOLET] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_CORE_RED] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_CORE_ORANGE] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_CORE_YELLOW] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_CORE_GREEN] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_CORE_BLUE] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_CORE_INDIGO] = sMiniorTeachableLearnset, - [SPECIES_MINIOR_CORE_VIOLET] = sMiniorTeachableLearnset, - // Mimikyu - [SPECIES_MIMIKYU_BUSTED] = sMimikyuTeachableLearnset, - // Necrozma - [SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaTeachableLearnset, - [SPECIES_NECROZMA_DAWN_WINGS] = sNecrozmaTeachableLearnset, - [SPECIES_NECROZMA_ULTRA] = sNecrozmaTeachableLearnset, - // Magearna - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaTeachableLearnset, -#endif -#if P_GEN_8_POKEMON == TRUE - // Cramorant - [SPECIES_CRAMORANT_GULPING] = sCramorantTeachableLearnset, - [SPECIES_CRAMORANT_GORGING] = sCramorantTeachableLearnset, - // Toxtricity - [SPECIES_TOXTRICITY_LOW_KEY] = sToxtricityLowKeyTeachableLearnset, - // Sinistea - [SPECIES_SINISTEA_ANTIQUE] = sSinisteaTeachableLearnset, - // Polteageist - [SPECIES_POLTEAGEIST_ANTIQUE] = sPolteageistTeachableLearnset, - // Alcremie - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAlcremieTeachableLearnset, - // Eiscue - [SPECIES_EISCUE_NOICE_FACE] = sEiscueTeachableLearnset, - // Indeedee - [SPECIES_INDEEDEE_FEMALE] = sIndeedeeFemaleTeachableLearnset, - // Morpeko - [SPECIES_MORPEKO_HANGRY] = sMorpekoTeachableLearnset, - // Zacian - [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianTeachableLearnset, - // Zamazenta - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaTeachableLearnset, - // Eternatus - [SPECIES_ETERNATUS_ETERNAMAX] = sEternatusTeachableLearnset, - // Urshifu - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = sUrshifuRapidStrikeStyleTeachableLearnset, - // Zarude - [SPECIES_ZARUDE_DADA] = sZarudeTeachableLearnset, - // Calyrex - [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderTeachableLearnset, - [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderTeachableLearnset, - // Enamorus + [SPECIES_ENAMORUS_INCARNATE] = sEnamorusTeachableLearnset, [SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset, #endif }; diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 80b2231a81..cd17ee525a 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1,21 +1,10 @@ -#define PIKACHU_BACK_PIC_COORDS \ -{ \ - .size = MON_COORDS_SIZE(64, 56), \ - .y_offset = 4, \ -} - -#define ARCEUS_BACK_PIC_COORDS \ -{ \ - .size = MON_COORDS_SIZE(64, 64), \ - .y_offset = 3, \ -} - -#define DEERLING_BACK_PIC_COORDS \ -{ \ - .size = MON_COORDS_SIZE(48, 56), \ - .y_offset = 9, \ -} +#define PIKACHU_BACK_PIC_COORDS { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4, } +#define ARCEUS_BACK_PIC_COORDS { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3, } +#define DEERLING_BACK_PIC_COORDS { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9, } +#define FLABEBE_BACK_PIC_COORDS { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12, } +#define FLOETTE_BACK_PIC_COORDS { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2, } +#define FLORGES_BACK_PIC_COORDS { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9, } // All Pokémon pics are 64x64, but this data table defines where in this 64x64 frame // the sprite's non-transparent pixels actually are. @@ -27,31 +16,56 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_BULBASAUR] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_IVYSAUR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, [SPECIES_VENUSAUR] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, + [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_CHARMANDER] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_CHARMELEON] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_CHARIZARD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_CHARIZARD_MEGA_X] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_CHARIZARD_MEGA_Y] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_SQUIRTLE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_WARTORTLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_BLASTOISE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_BLASTOISE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CATERPIE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_METAPOD] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, [SPECIES_BUTTERFREE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_WEEDLE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_KAKUNA] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 12 }, [SPECIES_BEEDRILL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_BEEDRILL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_PIDGEY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_PIDGEOTTO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_PIDGEOT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_PIDGEOT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_RATTATA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_RATTATA_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_RATICATE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, + [SPECIES_RATICATE_ALOLAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_SPEAROW] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_FEAROW] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_EKANS] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_ARBOK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_PIKACHU] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_COSPLAY] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_ROCK_STAR] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_BELLE] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_POP_STAR] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_PH_D] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_LIBRE] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_ORIGINAL_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_HOENN_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_SINNOH_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_UNOVA_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_KALOS_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_ALOLA_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_PARTNER_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_WORLD_CAP] = PIKACHU_BACK_PIC_COORDS, [SPECIES_RAICHU] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_RAICHU_ALOLAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_SANDSHREW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, + [SPECIES_SANDSHREW_ALOLAN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_SANDSLASH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, + [SPECIES_SANDSLASH_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_NIDORAN_F] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, [SPECIES_NIDORINA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_NIDOQUEEN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, @@ -61,7 +75,9 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CLEFAIRY] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, [SPECIES_CLEFABLE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_VULPIX] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_VULPIX_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_NINETALES] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_NINETALES_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_JIGGLYPUFF] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 12 }, [SPECIES_WIGGLYTUFF] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_ZUBAT] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, @@ -74,21 +90,29 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_VENONAT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_VENOMOTH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_DIGLETT] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, + [SPECIES_DIGLETT_ALOLAN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 14 }, [SPECIES_DUGTRIO] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, + [SPECIES_DUGTRIO_ALOLAN] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 17 }, [SPECIES_MEOWTH] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, + [SPECIES_MEOWTH_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_PERSIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_PERSIAN_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_PSYDUCK] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_GOLDUCK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_MANKEY] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_PRIMEAPE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_GROWLITHE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, + [SPECIES_GROWLITHE_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_ARCANINE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_POLIWAG] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 18 }, [SPECIES_POLIWHIRL] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_POLIWRATH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_ABRA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 12 }, [SPECIES_KADABRA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_ALAKAZAM] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_ALAKAZAM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MACHOP] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_MACHOKE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_MACHAMP] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, @@ -98,47 +122,65 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_TENTACOOL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_TENTACRUEL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_GEODUDE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, + [SPECIES_GEODUDE_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 13 }, [SPECIES_GRAVELER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, + [SPECIES_GRAVELER_ALOLAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_GOLEM] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, + [SPECIES_GOLEM_ALOLAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, [SPECIES_PONYTA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_PONYTA_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_RAPIDASH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RAPIDASH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SLOWPOKE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, + [SPECIES_SLOWPOKE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_SLOWBRO] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_SLOWBRO_MEGA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_SLOWBRO_GALARIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_MAGNEMITE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_MAGNETON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_FARFETCHD] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_FARFETCHD_GALARIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_DODUO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_DODRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SEEL] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_DEWGONG] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_GRIMER] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, + [SPECIES_GRIMER_ALOLAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_MUK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, + [SPECIES_MUK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SHELLDER] = { .size = MON_COORDS_SIZE(48, 24), .y_offset = 21 }, [SPECIES_CLOYSTER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_GASTLY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_HAUNTER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_GENGAR] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, + [SPECIES_GENGAR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ONIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DROWZEE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_HYPNO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_KRABBY] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_KINGLER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_VOLTORB] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 10 }, [SPECIES_ELECTRODE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, + [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 7 }, [SPECIES_EXEGGCUTE] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 18 }, [SPECIES_EXEGGUTOR] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, + [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_CUBONE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_MAROWAK] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, + [SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_HITMONLEE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_HITMONCHAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_LICKITUNG] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_KOFFING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_WEEZING] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_WEEZING_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_RHYHORN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_RHYDON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_CHANSEY] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_TANGELA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_KANGASKHAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_KANGASKHAN_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_HORSEA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_SEADRA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GOLDEEN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, @@ -146,14 +188,17 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_STARYU] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_STARMIE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_MR_MIME] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, + [SPECIES_MR_MIME_GALARIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_SCYTHER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_JYNX] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_ELECTABUZZ] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_MAGMAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_PINSIR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_PINSIR_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_TAUROS] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, [SPECIES_MAGIKARP] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GYARADOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_GYARADOS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_LAPRAS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_DITTO] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, [SPECIES_EEVEE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, @@ -166,14 +211,20 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_KABUTO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, [SPECIES_KABUTOPS] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_AERODACTYL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, + [SPECIES_AERODACTYL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_SNORLAX] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_ARTICUNO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_ARTICUNO_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_ZAPDOS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, + [SPECIES_ZAPDOS_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_MOLTRES] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_MOLTRES_GALARIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_DRATINI] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_DRAGONAIR] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 4 }, [SPECIES_DRAGONITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_MEWTWO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_MEWTWO_MEGA_X] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_MEWTWO_MEGA_Y] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MEW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CHIKORITA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_BAYLEEF] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, @@ -181,6 +232,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CYNDAQUIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_QUILAVA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TYPHLOSION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 3 }, [SPECIES_TOTODILE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_CROCONAW] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_FERALIGATR] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, @@ -196,6 +248,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CHINCHOU] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_LANTURN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_PICHU] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, + [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, [SPECIES_CLEFFA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, [SPECIES_IGGLYBUFF] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_TOGEPI] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, @@ -205,6 +258,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_MAREEP] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_FLAAFFY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_AMPHAROS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, + [SPECIES_AMPHAROS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BELLOSSOM] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_MARILL] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_AZUMARILL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, @@ -223,6 +277,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_UMBREON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MURKROW] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 10 }, [SPECIES_SLOWKING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, + [SPECIES_SLOWKING_GALARIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_MISDREAVUS] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_UNOWN] = { .size = MON_COORDS_SIZE(24, 48), .y_offset = 8 }, [SPECIES_UNOWN_B] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, @@ -259,13 +314,18 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_DUNSPARCE] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 17 }, [SPECIES_GLIGAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_STEELIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_STEELIX_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SNUBBULL] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_GRANBULL] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_QWILFISH] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, + [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_SCIZOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_SCIZOR_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_SHUCKLE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_HERACROSS] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_HERACROSS_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_SNEASEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_TEDDIURSA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_URSARING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_SLUGMA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, @@ -273,6 +333,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SWINUB] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_PILOSWINE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_CORSOLA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, + [SPECIES_CORSOLA_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_REMORAID] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_OCTILLERY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_DELIBIRD] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, @@ -280,6 +341,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SKARMORY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, [SPECIES_HOUNDOUR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_HOUNDOOM] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_HOUNDOOM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KINGDRA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_PHANPY] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_DONPHAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, @@ -299,22 +361,28 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_LARVITAR] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 8 }, [SPECIES_PUPITAR] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_TYRANITAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_TYRANITAR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LUGIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_HO_OH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_CELEBI] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_TREECKO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_GROVYLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_SCEPTILE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_SCEPTILE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_TORCHIC] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_COMBUSKEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_BLAZIKEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BLAZIKEN_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_MUDKIP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_MARSHTOMP] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SWAMPERT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_SWAMPERT_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_POOCHYENA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_MIGHTYENA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ZIGZAGOON] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, + [SPECIES_ZIGZAGOON_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 12 }, [SPECIES_LINOONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, + [SPECIES_LINOONE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_WURMPLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SILCOON] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_BEAUTIFLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -333,6 +401,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_RALTS] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 13 }, [SPECIES_KIRLIA] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_GARDEVOIR] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, + [SPECIES_GARDEVOIR_MEGA] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_SURSKIT] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_MASQUERAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SHROOMISH] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, @@ -353,14 +422,19 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SKITTY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_DELCATTY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SABLEYE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 13 }, + [SPECIES_SABLEYE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_MAWILE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_MAWILE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_ARON] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_LAIRON] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 15 }, [SPECIES_AGGRON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_AGGRON_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_MEDITITE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_MEDICHAM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_MEDICHAM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_ELECTRIKE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_MANECTRIC] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_MANECTRIC_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PLUSLE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_MINUN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 4 }, [SPECIES_VOLBEAT] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, @@ -370,10 +444,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SWALOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_CARVANHA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_SHARPEDO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_SHARPEDO_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_WAILMER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_WAILORD] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_NUMEL] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_CAMERUPT] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, + [SPECIES_CAMERUPT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_TORKOAL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_SPOINK] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 4 }, [SPECIES_GRUMPIG] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -385,6 +461,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CACTURNE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SWABLU] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_ALTARIA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, + [SPECIES_ALTARIA_MEGA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_ZANGOOSE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SEVIPER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_LUNATONE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, @@ -408,14 +485,17 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_KECLEON] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_SHUPPET] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_BANETTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_BANETTE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DUSKULL] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_DUSCLOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_TROPIUS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_CHIMECHO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, [SPECIES_ABSOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_ABSOL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WYNAUT] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_SNORUNT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_GLALIE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, + [SPECIES_GLALIE_MEGA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_SPHEAL] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_SEALEO] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_WALREIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -427,24 +507,30 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_BAGON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_SHELGON] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_SALAMENCE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 4 }, + [SPECIES_SALAMENCE_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_BELDUM] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_METANG] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_METAGROSS] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_METAGROSS_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_REGIROCK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 10 }, [SPECIES_REGICE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_REGISTEEL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_LATIAS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_LATIAS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_LATIOS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_LATIOS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_KYOGRE] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 18 }, + [SPECIES_KYOGRE_PRIMAL] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 18 }, [SPECIES_GROUDON] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, + [SPECIES_GROUDON_PRIMAL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_RAYQUAZA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RAYQUAZA_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_JIRACHI] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_DEOXYS_NORMAL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_DEOXYS_ATTACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_DEOXYS_DEFENSE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_DEOXYS_SPEED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #if P_GEN_4_POKEMON == TRUE -// Diamond and Pearl [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_GROTLE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_TORTERRA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, @@ -487,13 +573,14 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CHERRIM_SUNSHINE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SHELLOS_WEST_SEA] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 8 }, [SPECIES_SHELLOS_EAST_SEA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, - [SPECIES_GASTRODON] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, + [SPECIES_GASTRODON_WEST_SEA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_GASTRODON_EAST_SEA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_AMBIPOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_DRIFLOON] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, [SPECIES_DRIFBLIM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_BUNEARY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_LOPUNNY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_LOPUNNY_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_MISMAGIUS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_HONCHKROW] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_GLAMEOW] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, @@ -511,9 +598,11 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_GIBLE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_GABITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_GARCHOMP] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_GARCHOMP_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_MUNCHLAX] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_RIOLU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_LUCARIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LUCARIO_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_HIPPOPOTAS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_HIPPOWDON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SKORUPI] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, @@ -526,6 +615,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_MANTYKE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SNOVER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_ABOMASNOW] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_ABOMASNOW_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WEAVILE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_MAGNEZONE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_LICKILICKY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -541,23 +631,33 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_MAMOSWINE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_PORYGON_Z] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GALLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_GALLADE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_PROBOPASS] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_DUSKNOIR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_FROSLASS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ROTOM] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, + [SPECIES_ROTOM_HEAT] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, + [SPECIES_ROTOM_WASH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, + [SPECIES_ROTOM_FROST] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_ROTOM_FAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, + [SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_UXIE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_MESPRIT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_AZELF] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_DIALGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DIALGA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PALKIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_PALKIA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_HEATRAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_REGIGIGAS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_GIRATINA_ALTERED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_CRESSELIA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 10 }, [SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SHAYMIN_LAND] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, + [SPECIES_SHAYMIN_SKY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_ARCEUS_NORMAL] = ARCEUS_BACK_PIC_COORDS, [SPECIES_ARCEUS_FIGHTING] = ARCEUS_BACK_PIC_COORDS, [SPECIES_ARCEUS_FLYING] = ARCEUS_BACK_PIC_COORDS, @@ -575,20 +675,9 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_ARCEUS_ICE] = ARCEUS_BACK_PIC_COORDS, [SPECIES_ARCEUS_DRAGON] = ARCEUS_BACK_PIC_COORDS, [SPECIES_ARCEUS_DARK] = ARCEUS_BACK_PIC_COORDS, -// Platinum - [SPECIES_ROTOM_HEAT] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_ROTOM_WASH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, - [SPECIES_ROTOM_FROST] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_ROTOM_FAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, - [SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, - [SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_SHAYMIN_SKY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_ARCEUS_FAIRY] = ARCEUS_BACK_PIC_COORDS, #endif -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, - #if P_GEN_5_POKEMON == TRUE -// Black and White [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 7 }, [SPECIES_SNIVY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_SERVINE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, @@ -599,6 +688,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_OSHAWOTT] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 14 }, [SPECIES_DEWOTT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 5 }, [SPECIES_SAMUROTT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, + [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PATRAT] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_WATCHOG] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_LILLIPUP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, @@ -627,6 +717,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_DRILBUR] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_EXCADRILL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_AUDINO] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 9 }, + [SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_TIMBURR] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 15 }, [SPECIES_GURDURR] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_CONKELDURR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 13 }, @@ -645,14 +736,19 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_WHIMSICOTT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_PETILIL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 9 }, [SPECIES_LILLIGANT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, + [SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_BASCULIN_RED_STRIPED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 16 }, [SPECIES_BASCULIN_BLUE_STRIPED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 16 }, + [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 16 }, [SPECIES_SANDILE] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 18 }, [SPECIES_KROKOROK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_KROOKODILE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_DARUMAKA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 12 }, - [SPECIES_DARMANITAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, + [SPECIES_DARMANITAN_STANDARD_MODE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_DARMANITAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_MARACTUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_DWEBBLE] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 17 }, [SPECIES_CRUSTLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, @@ -660,6 +756,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SCRAFTY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, [SPECIES_SIGILYPH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_YAMASK] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, + [SPECIES_YAMASK_GALARIAN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_COFAGRIGUS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_TIRTOUGA] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 16 }, [SPECIES_CARRACOSTA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, @@ -668,7 +765,9 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_TRUBBISH] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 13 }, [SPECIES_GARBODOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_ZORUA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_ZOROARK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 10 }, + [SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MINCCINO] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_CINCCINO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_GOTHITA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, @@ -682,11 +781,11 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_VANILLITE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, [SPECIES_VANILLISH] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_VANILLUXE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_DEERLING] = DEERLING_BACK_PIC_COORDS, + [SPECIES_DEERLING_SPRING] = DEERLING_BACK_PIC_COORDS, [SPECIES_DEERLING_SUMMER] = DEERLING_BACK_PIC_COORDS, [SPECIES_DEERLING_AUTUMN] = DEERLING_BACK_PIC_COORDS, [SPECIES_DEERLING_WINTER] = DEERLING_BACK_PIC_COORDS, - [SPECIES_SAWSBUCK] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, + [SPECIES_SAWSBUCK_SPRING] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, [SPECIES_SAWSBUCK_SUMMER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_SAWSBUCK_AUTUMN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_SAWSBUCK_WINTER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, @@ -722,6 +821,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SHELMET] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 19 }, [SPECIES_ACCELGOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_STUNFISK] = { .size = MON_COORDS_SIZE(64, 24), .y_offset = 22 }, + [SPECIES_STUNFISK_GALARIAN] = { .size = MON_COORDS_SIZE(64, 24), .y_offset = 23 }, [SPECIES_MIENFOO] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, [SPECIES_MIENSHAO] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_DRUDDIGON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, @@ -732,6 +832,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_BOUFFALANT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_RUFFLET] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_BRAVIARY] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, + [SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 0 }, [SPECIES_VULLABY] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 14 }, [SPECIES_MANDIBUZZ] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_HEATMOR] = { .size = MON_COORDS_SIZE(64, 24), .y_offset = 21 }, @@ -744,30 +845,28 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_COBALION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 6 }, [SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_VIRIZION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_TORNADUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_THUNDURUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TORNADUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TORNADUS_THERIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_THUNDURUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_THUNDURUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_RESHIRAM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_ZEKROM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_LANDORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LANDORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LANDORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_KYUREM] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_KELDEO] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 4 }, - [SPECIES_MELOETTA] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, + [SPECIES_KYUREM_WHITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_KYUREM_BLACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_KELDEO_ORDINARY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 4 }, + [SPECIES_KELDEO_RESOLUTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_MELOETTA_ARIA] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_MELOETTA_PIROUETTE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 4 }, [SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_GENESECT_DOUSE_DRIVE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_GENESECT_SHOCK_DRIVE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_GENESECT_BURN_DRIVE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_GENESECT_CHILL_DRIVE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, -// Black 2 and White 2 - [SPECIES_TORNADUS_THERIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_THUNDURUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_LANDORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_KYUREM_WHITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_KYUREM_BLACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_KELDEO_RESOLUTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, #endif #if P_GEN_6_POKEMON == TRUE -// X and Y [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 6 }, [SPECIES_QUILLADIN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_CHESNAUGHT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 10 }, @@ -777,6 +876,8 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_FROAKIE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_FROGADIER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GRENINJA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, + [SPECIES_GRENINJA_BATTLE_BOND] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, + [SPECIES_GRENINJA_ASH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_BUNNELBY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, [SPECIES_DIGGERSBY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_FLETCHLING] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, @@ -784,22 +885,65 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_TALONFLAME] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_SCATTERBUG] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 12 }, [SPECIES_SPEWPA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, - [SPECIES_VIVILLON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_ICY_SNOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_POLAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_TUNDRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_CONTINENTAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_GARDEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_ELEGANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_MEADOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_MODERN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_MARINE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_ARCHIPELAGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_HIGH_PLAINS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_SANDSTORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_RIVER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_MONSOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_SAVANNA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_SUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_OCEAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_JUNGLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_FANCY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_POKE_BALL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LITLEO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_PYROAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_FLABEBE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_FLOETTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_FLORGES] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_FLABEBE_RED_FLOWER] = FLABEBE_BACK_PIC_COORDS, + [SPECIES_FLABEBE_YELLOW_FLOWER] = FLABEBE_BACK_PIC_COORDS, + [SPECIES_FLABEBE_ORANGE_FLOWER] = FLABEBE_BACK_PIC_COORDS, + [SPECIES_FLABEBE_BLUE_FLOWER] = FLABEBE_BACK_PIC_COORDS, + [SPECIES_FLABEBE_WHITE_FLOWER] = FLABEBE_BACK_PIC_COORDS, + [SPECIES_FLOETTE_RED_FLOWER] = FLOETTE_BACK_PIC_COORDS, + [SPECIES_FLOETTE_YELLOW_FLOWER] = FLOETTE_BACK_PIC_COORDS, + [SPECIES_FLOETTE_ORANGE_FLOWER] = FLOETTE_BACK_PIC_COORDS, + [SPECIES_FLOETTE_BLUE_FLOWER] = FLOETTE_BACK_PIC_COORDS, + [SPECIES_FLOETTE_WHITE_FLOWER] = FLOETTE_BACK_PIC_COORDS, + [SPECIES_FLOETTE_ETERNAL_FLOWER] = FLOETTE_BACK_PIC_COORDS, + [SPECIES_FLORGES_RED_FLOWER] = FLORGES_BACK_PIC_COORDS, + [SPECIES_FLORGES_YELLOW_FLOWER] = FLORGES_BACK_PIC_COORDS, + [SPECIES_FLORGES_ORANGE_FLOWER] = FLORGES_BACK_PIC_COORDS, + [SPECIES_FLORGES_BLUE_FLOWER] = FLORGES_BACK_PIC_COORDS, + [SPECIES_FLORGES_WHITE_FLOWER] = FLORGES_BACK_PIC_COORDS, [SPECIES_SKIDDO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_GOGOAT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, [SPECIES_PANCHAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_PANGORO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_FURFROU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_FURFROU_NATURAL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_FURFROU_HEART_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_FURFROU_STAR_TRIM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_FURFROU_DIAMOND_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_FURFROU_DEBUTANTE_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_FURFROU_MATRON_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_FURFROU_DANDY_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_FURFROU_LA_REINE_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_FURFROU_KABUKI_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_FURFROU_PHARAOH_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_ESPURR] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, - [SPECIES_MEOWSTIC] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_MEOWSTIC_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_MEOWSTIC_FEMALE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 9 }, [SPECIES_HONEDGE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_DOUBLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_AEGISLASH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_AEGISLASH_SHIELD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_AEGISLASH_BLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_SPRITZEE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_AROMATISSE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_SWIRLIX] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, @@ -824,27 +968,44 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CARBINK] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_GOOMY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_SLIGGOO] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, + [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GOODRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KLEFKI] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 8 }, [SPECIES_PHANTUMP] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, [SPECIES_TREVENANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_PUMPKABOO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, - [SPECIES_GOURGEIST] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_PUMPKABOO_AVERAGE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, + [SPECIES_PUMPKABOO_SMALL] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 14 }, + [SPECIES_PUMPKABOO_LARGE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, + [SPECIES_PUMPKABOO_SUPER] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 12 }, + [SPECIES_GOURGEIST_AVERAGE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_GOURGEIST_SMALL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, + [SPECIES_GOURGEIST_LARGE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_GOURGEIST_SUPER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_BERGMITE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, [SPECIES_AVALUGG] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, + [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 17 }, [SPECIES_NOIBAT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 7 }, [SPECIES_NOIVERN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_XERNEAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_XERNEAS_NEUTRAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_XERNEAS_ACTIVE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_YVELTAL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, - [SPECIES_ZYGARDE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_ZYGARDE_50] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_ZYGARDE_10] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_ZYGARDE_COMPLETE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DIANCIE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_HOOPA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, + [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_HOOPA_CONFINED] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, + [SPECIES_HOOPA_UNBOUND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_VOLCANION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, #endif #if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_DARTRIX] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_DECIDUEYE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, + [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LITTEN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_TORRACAT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_INCINEROAR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, @@ -861,12 +1022,19 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_VIKAVOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CRABRAWLER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ORICORIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ORICORIO_BAILE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ORICORIO_POM_POM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ORICORIO_PAU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ORICORIO_SENSU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 15 }, [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_LYCANROC] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_WISHIWASHI] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 18 }, + [SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 18 }, + [SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_MAREANIE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 15 }, [SPECIES_TOXAPEX] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_MUDBRAY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, @@ -893,12 +1061,43 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_PALOSSAND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_PYUKUMUKU] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 16 }, [SPECIES_TYPE_NULL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_SILVALLY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_MINIOR] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_SILVALLY_NORMAL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_FIGHTING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_FLYING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_POISON] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_GROUND] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_ROCK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_BUG] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_GHOST] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_STEEL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_FIRE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_WATER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_GRASS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_ELECTRIC] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_PSYCHIC] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_ICE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_DRAGON] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_DARK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_FAIRY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_ORANGE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_YELLOW] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_GREEN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_BLUE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_INDIGO] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_VIOLET] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_RED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, + [SPECIES_MINIOR_CORE_ORANGE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, + [SPECIES_MINIOR_CORE_YELLOW] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, + [SPECIES_MINIOR_CORE_GREEN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, + [SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, + [SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, + [SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, - [SPECIES_MIMIKYU] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 15 }, [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 14 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, @@ -921,7 +1120,11 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_KARTANA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_GUZZLORD] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 10 }, [SPECIES_NECROZMA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_NECROZMA_DUSK_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_NECROZMA_DAWN_WINGS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_NECROZMA_ULTRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_MAGEARNA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_MARSHADOW] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 6 }, [SPECIES_POIPOLE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_NAGANADEL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, @@ -968,16 +1171,21 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SILICOBRA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_SANDACONDA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_CRAMORANT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_CRAMORANT_GULPING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_CRAMORANT_GORGING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_ARROKUDA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_BARRASKEWDA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_TOXEL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, - [SPECIES_TOXTRICITY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_TOXTRICITY_AMPED] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_TOXTRICITY_LOW_KEY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, [SPECIES_SIZZLIPEDE] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_CENTISKORCH] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_CLOBBOPUS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_GRAPPLOCT] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_SINISTEA] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 16 }, - [SPECIES_POLTEAGEIST] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, + [SPECIES_SINISTEA_PHONY] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 16 }, + [SPECIES_SINISTEA_ANTIQUE] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 16 }, + [SPECIES_POLTEAGEIST_PHONY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, + [SPECIES_POLTEAGEIST_ANTIQUE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_HATENNA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_HATTREM] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_HATTERENE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, @@ -991,15 +1199,28 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_MR_RIME] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_RUNERIGUS] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_MILCERY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 16 }, - [SPECIES_ALCREMIE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + //[SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM_GIGANTAMAX] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + //[SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_FALINKS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 15 }, [SPECIES_PINCURCHIN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_SNOM] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, [SPECIES_FROSMOTH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_STONJOURNER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_EISCUE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_INDEEDEE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, - [SPECIES_MORPEKO] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, + [SPECIES_EISCUE_ICE_FACE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, + [SPECIES_EISCUE_NOICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, + [SPECIES_INDEEDEE_MALE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_INDEEDEE_FEMALE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_MORPEKO_FULL_BELLY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, + [SPECIES_MORPEKO_HANGRY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, [SPECIES_CUFANT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_COPPERAJAH] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 16 }, [SPECIES_DRACOZOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, @@ -1010,295 +1231,31 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_DREEPY] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_DRAKLOAK] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_DRAGAPULT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_ZACIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_ZAMAZENTA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_ZACIAN_CROWNED_SWORD] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ETERNATUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ETERNATUS_ETERNAMAX] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_KUBFU] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, - [SPECIES_URSHIFU] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_ZARUDE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_ZARUDE_DADA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_REGIELEKI] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_REGIDRAGO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_GLASTRIER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 5 }, [SPECIES_SPECTRIER] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_CALYREX] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, + [SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_WYRDEER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_BASCULEGION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_ENAMORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif - [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_CHARIZARD_MEGA_X] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_CHARIZARD_MEGA_Y] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_BLASTOISE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BEEDRILL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_PIDGEOT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_ALAKAZAM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SLOWBRO_MEGA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_GENGAR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_KANGASKHAN_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_PINSIR_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_GYARADOS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_AERODACTYL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_MEWTWO_MEGA_X] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_MEWTWO_MEGA_Y] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_AMPHAROS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_STEELIX_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SCIZOR_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_HERACROSS_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_HOUNDOOM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TYRANITAR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SCEPTILE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_BLAZIKEN_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SWAMPERT_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_GARDEVOIR_MEGA] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_SABLEYE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, - [SPECIES_MAWILE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_AGGRON_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_MEDICHAM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_MANECTRIC_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SHARPEDO_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_CAMERUPT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, - [SPECIES_ALTARIA_MEGA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, - [SPECIES_BANETTE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ABSOL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GLALIE_MEGA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, - [SPECIES_SALAMENCE_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_METAGROSS_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_LATIAS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_LATIOS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_GARCHOMP_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_LUCARIO_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ABOMASNOW_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GALLADE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, -#endif - [SPECIES_RAYQUAZA_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_KYOGRE_PRIMAL] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 18 }, - [SPECIES_GROUDON_PRIMAL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, - [SPECIES_RATTATA_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_RATICATE_ALOLAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, - [SPECIES_RAICHU_ALOLAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, - [SPECIES_SANDSHREW_ALOLAN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, - [SPECIES_SANDSLASH_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_VULPIX_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_NINETALES_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_DIGLETT_ALOLAN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 14 }, - [SPECIES_DUGTRIO_ALOLAN] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 17 }, - [SPECIES_MEOWTH_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_PERSIAN_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_GEODUDE_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 13 }, - [SPECIES_GRAVELER_ALOLAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, - [SPECIES_GOLEM_ALOLAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, - [SPECIES_GRIMER_ALOLAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, - [SPECIES_MUK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, - [SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_PONYTA_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_RAPIDASH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_SLOWPOKE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, - [SPECIES_SLOWBRO_GALARIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_FARFETCHD_GALARIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, - [SPECIES_WEEZING_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MR_MIME_GALARIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, - [SPECIES_ARTICUNO_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_ZAPDOS_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, - [SPECIES_MOLTRES_GALARIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_SLOWKING_GALARIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, - [SPECIES_CORSOLA_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, - [SPECIES_ZIGZAGOON_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 12 }, - [SPECIES_LINOONE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, - [SPECIES_DARMANITAN_GALARIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_YAMASK_GALARIAN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, - [SPECIES_STUNFISK_GALARIAN] = { .size = MON_COORDS_SIZE(64, 24), .y_offset = 23 }, -#endif -// Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, - [SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 10 }, - [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 7 }, - [SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 3 }, - [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, - [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 0 }, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 17 }, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif - [SPECIES_PIKACHU_COSPLAY] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_ROCK_STAR] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_BELLE] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_POP_STAR] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_PH_D] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_LIBRE] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_ORIGINAL_CAP] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_HOENN_CAP] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_SINNOH_CAP] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_UNOVA_CAP] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_KALOS_CAP] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_ALOLA_CAP] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_PARTNER_CAP] = PIKACHU_BACK_PIC_COORDS, - [SPECIES_PIKACHU_WORLD_CAP] = PIKACHU_BACK_PIC_COORDS, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_DIALGA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_PALKIA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ARCEUS_FAIRY] = ARCEUS_BACK_PIC_COORDS, -#endif -#if P_GEN_5_POKEMON == TRUE - - [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 16 }, - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_GRENINJA_BATTLE_BOND] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, - [SPECIES_GRENINJA_ASH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, - [SPECIES_VIVILLON_POLAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_TUNDRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_CONTINENTAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_GARDEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_ELEGANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_MEADOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_MODERN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_MARINE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_ARCHIPELAGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_HIGH_PLAINS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_SANDSTORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_RIVER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_MONSOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_SAVANNA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_SUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_OCEAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_JUNGLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_FANCY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_POKE_BALL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLABEBE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_FLABEBE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_FLABEBE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_FLABEBE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_FLOETTE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_FLOETTE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_FLOETTE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_FLOETTE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_FLOETTE_ETERNAL_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_FLORGES_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_FLORGES_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_FLORGES_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_FLORGES_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_FURFROU_HEART_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_FURFROU_STAR_TRIM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_FURFROU_DIAMOND_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_FURFROU_DEBUTANTE_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_FURFROU_MATRON_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_FURFROU_DANDY_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_FURFROU_LA_REINE_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_FURFROU_KABUKI_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_FURFROU_PHARAOH_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_MEOWSTIC_FEMALE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 9 }, - [SPECIES_AEGISLASH_BLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, - [SPECIES_PUMPKABOO_SMALL] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 14 }, - [SPECIES_PUMPKABOO_LARGE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, - [SPECIES_PUMPKABOO_SUPER] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 12 }, - [SPECIES_GOURGEIST_SMALL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, - [SPECIES_GOURGEIST_LARGE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_GOURGEIST_SUPER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_XERNEAS_ACTIVE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ZYGARDE_10] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_ZYGARDE_COMPLETE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_HOOPA_UNBOUND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_ORICORIO_POM_POM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ORICORIO_PAU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ORICORIO_SENSU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_SILVALLY_FIGHTING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_FLYING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_POISON] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_GROUND] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_ROCK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_BUG] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_GHOST] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_STEEL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_FIRE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_WATER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_GRASS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_ELECTRIC] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_PSYCHIC] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_ICE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_DRAGON] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_DARK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_FAIRY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_MINIOR_METEOR_ORANGE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_YELLOW] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_GREEN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_BLUE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_INDIGO] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_VIOLET] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_RED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, - [SPECIES_MINIOR_CORE_ORANGE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, - [SPECIES_MINIOR_CORE_YELLOW] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, - [SPECIES_MINIOR_CORE_GREEN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, - [SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, - [SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, - [SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, - [SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 15 }, - [SPECIES_NECROZMA_DUSK_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_NECROZMA_DAWN_WINGS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_NECROZMA_ULTRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, -#endif -#if P_GEN_8_POKEMON == TRUE - [SPECIES_CRAMORANT_GULPING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_CRAMORANT_GORGING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_TOXTRICITY_LOW_KEY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_SINISTEA_ANTIQUE] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 16 }, - [SPECIES_POLTEAGEIST_ANTIQUE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_EISCUE_NOICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, - [SPECIES_INDEEDEE_FEMALE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_MORPEKO_HANGRY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, - [SPECIES_ZACIAN_CROWNED_SWORD] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ETERNATUS_ETERNAMAX] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_ZARUDE_DADA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 2334225839..f8861ab5ea 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -4,20 +4,29 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = { [SPECIES_BUTTERFREE] = 10, [SPECIES_BEEDRILL] = 9, + [SPECIES_BEEDRILL_MEGA] = 5, [SPECIES_PIDGEOT] = 5, + [SPECIES_PIDGEOT_MEGA] = 8, [SPECIES_FEAROW] = 6, + [SPECIES_RAICHU_ALOLAN] = 4, [SPECIES_ZUBAT] = 16, [SPECIES_GOLBAT] = 10, [SPECIES_VENOMOTH] = 16, + [SPECIES_ALAKAZAM_MEGA] = 7, [SPECIES_GEODUDE] = 16, + [SPECIES_GEODUDE_ALOLAN] = 16, [SPECIES_MAGNEMITE] = 17, [SPECIES_MAGNETON] = 9, [SPECIES_GASTLY] = 10, [SPECIES_HAUNTER] = 11, [SPECIES_KOFFING] = 14, [SPECIES_WEEZING] = 6, + [SPECIES_PINSIR] = 4, + [SPECIES_GYARADOS_MEGA] = 6, [SPECIES_AERODACTYL] = 9, + [SPECIES_AERODACTYL_MEGA] = 7, [SPECIES_ZAPDOS] = 8, + [SPECIES_MEWTWO_MEGA_Y] = 3, [SPECIES_MEW] = 11, [SPECIES_LEDIAN] = 10, [SPECIES_CROBAT] = 9, @@ -68,9 +77,11 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_WINGULL] = 15, [SPECIES_PELIPPER] = 8, [SPECIES_MASQUERAIN] = 10, + [SPECIES_SHARPEDO_MEGA] = 1, + [SPECIES_ALTARIA_MEGA] = 6, + [SPECIES_FLYGON] = 7, [SPECIES_BALTOY] = 5, [SPECIES_CLAYDOL] = 10, - [SPECIES_FLYGON] = 7, [SPECIES_GLALIE] = 12, [SPECIES_LUNATONE] = 13, [SPECIES_SOLROCK] = 4, @@ -88,7 +99,13 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_LATIOS] = 6, [SPECIES_JIRACHI] = 14, [SPECIES_CHIMECHO] = 16, -// Diamond and Pearl + [SPECIES_BANETTE_MEGA] = 5, + [SPECIES_GLALIE_MEGA] = 8, + [SPECIES_METAGROSS_MEGA] = 4, + [SPECIES_LATIAS_MEGA] = 8, + [SPECIES_LATIOS_MEGA] = 8, + [SPECIES_RAYQUAZA_MEGA] = 4, +// Gen 4 [SPECIES_MOTHIM] = 10, [SPECIES_COMBEE] = 8, [SPECIES_VESPIQUEN] = 4, @@ -136,91 +153,16 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_BRAVIARY] = 8, [SPECIES_HYDREIGON] = 3, [SPECIES_VOLCARONA] = 6, - [SPECIES_TORNADUS] = 7, - [SPECIES_THUNDURUS] = 7, - [SPECIES_LANDORUS] = 7, - [SPECIES_MELOETTA] = 8, + [SPECIES_TORNADUS_INCARNATE] = 7, + [SPECIES_THUNDURUS_INCARNATE] = 7, + [SPECIES_THUNDURUS_THERIAN] = 7, + [SPECIES_LANDORUS_INCARNATE] = 7, + [SPECIES_MELOETTA_ARIA] = 8, + [SPECIES_MELOETTA_PIROUETTE] = 5, // Gen 6 [SPECIES_FLETCHINDER] = 9, [SPECIES_TALONFLAME] = 7, - [SPECIES_VIVILLON] = 9, - [SPECIES_FLABEBE] = 6, - [SPECIES_FLOETTE] = 4, - [SPECIES_HONEDGE] = 4, - [SPECIES_DOUBLADE] = 5, - [SPECIES_AEGISLASH] = 3, - [SPECIES_SPRITZEE] = 14, - [SPECIES_INKAY] = 14, - [SPECIES_CARBINK] = 4, - [SPECIES_KLEFKI] = 5, - [SPECIES_PHANTUMP] = 5, - [SPECIES_NOIBAT] = 8, - [SPECIES_YVELTAL] = 5, - [SPECIES_HOOPA] = 13, - // Gen 7 - [SPECIES_VIKAVOLT] = 8, - [SPECIES_CUTIEFLY] = 10, - [SPECIES_RIBOMBEE] = 6, - [SPECIES_COMFEY] = 8, - [SPECIES_MINIOR] = 17, - [SPECIES_DHELMISE] = 2, - [SPECIES_TAPU_KOKO] = 9, - [SPECIES_TAPU_LELE] = 8, - [SPECIES_TAPU_BULU] = 5, - [SPECIES_TAPU_FINI] = 6, - [SPECIES_COSMOG] = 7, - [SPECIES_COSMOEM] = 3, - [SPECIES_LUNALA] = 6, - [SPECIES_NIHILEGO] = 6, - [SPECIES_KARTANA] = 3, - [SPECIES_NECROZMA] = 6, - [SPECIES_POIPOLE] = 9, - [SPECIES_NAGANADEL] = 7, - // Gen 8 - [SPECIES_CORVISQUIRE] = 10, - [SPECIES_ORBEETLE] = 8, - [SPECIES_FLAPPLE] = 9, - [SPECIES_SINISTEA] = 9, - [SPECIES_POLTEAGEIST] = 11, - [SPECIES_RUNERIGUS] = 5, - [SPECIES_MILCERY] = 10, - [SPECIES_FROSMOTH] = 7, - [SPECIES_DREEPY] = 5, - [SPECIES_DRAKLOAK] = 5, - [SPECIES_DRAGAPULT] = 3, - [SPECIES_ETERNATUS] = 4, - [SPECIES_REGIELEKI] = 8, - [SPECIES_REGIDRAGO] = 5, - // Megas - [SPECIES_BEEDRILL_MEGA] = 5, - [SPECIES_PIDGEOT_MEGA] = 8, - [SPECIES_ALAKAZAM_MEGA] = 7, - [SPECIES_PINSIR_MEGA] = 4, - [SPECIES_GYARADOS_MEGA] = 6, - [SPECIES_AERODACTYL_MEGA] = 7, - [SPECIES_MEWTWO_MEGA_Y] = 3, - [SPECIES_SHARPEDO_MEGA] = 1, - [SPECIES_ALTARIA_MEGA] = 6, - [SPECIES_BANETTE_MEGA] = 5, - [SPECIES_GLALIE_MEGA] = 8, - [SPECIES_METAGROSS_MEGA] = 4, - [SPECIES_LATIAS_MEGA] = 8, - [SPECIES_LATIOS_MEGA] = 8, - [SPECIES_RAYQUAZA_MEGA] = 4, - // Alolan Forms - [SPECIES_RAICHU_ALOLAN] = 4, - [SPECIES_GEODUDE_ALOLAN] = 16, - // Galarian Forms - [SPECIES_WEEZING_GALARIAN] = 6, - [SPECIES_ARTICUNO_GALARIAN] = 10, - [SPECIES_YAMASK_GALARIAN] = 4, - // Hisuian Forms - [SPECIES_VOLTORB_HISUIAN] = 1, - [SPECIES_ELECTRODE_HISUIAN] = 4, - [SPECIES_BRAVIARY_HISUIAN] = 3, - // Other Forms - [SPECIES_THUNDURUS_THERIAN] = 7, - [SPECIES_MELOETTA_PIROUETTE] = 5, + [SPECIES_VIVILLON_ICY_SNOW] = 9, [SPECIES_VIVILLON_POLAR] = 9, [SPECIES_VIVILLON_TUNDRA] = 9, [SPECIES_VIVILLON_CONTINENTAL] = 9, @@ -240,17 +182,36 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_VIVILLON_JUNGLE] = 9, [SPECIES_VIVILLON_FANCY] = 9, [SPECIES_VIVILLON_POKE_BALL] = 9, + [SPECIES_FLABEBE_RED_FLOWER] = 6, [SPECIES_FLABEBE_YELLOW_FLOWER] = 6, [SPECIES_FLABEBE_ORANGE_FLOWER] = 6, [SPECIES_FLABEBE_BLUE_FLOWER] = 6, [SPECIES_FLABEBE_WHITE_FLOWER] = 6, + [SPECIES_FLOETTE_RED_FLOWER] = 4, [SPECIES_FLOETTE_YELLOW_FLOWER] = 4, [SPECIES_FLOETTE_ORANGE_FLOWER] = 4, [SPECIES_FLOETTE_BLUE_FLOWER] = 4, [SPECIES_FLOETTE_WHITE_FLOWER] = 4, [SPECIES_FLOETTE_ETERNAL_FLOWER] = 4, + [SPECIES_HONEDGE] = 4, + [SPECIES_DOUBLADE] = 5, + [SPECIES_AEGISLASH_SHIELD] = 3, [SPECIES_AEGISLASH_BLADE] = 3, + [SPECIES_SPRITZEE] = 14, + [SPECIES_INKAY] = 14, + [SPECIES_CARBINK] = 4, + [SPECIES_KLEFKI] = 5, + [SPECIES_PHANTUMP] = 5, + [SPECIES_NOIBAT] = 8, + [SPECIES_YVELTAL] = 5, + [SPECIES_HOOPA_CONFINED] = 13, [SPECIES_HOOPA_UNBOUND] = 3, + // Gen 7 + [SPECIES_VIKAVOLT] = 8, + [SPECIES_CUTIEFLY] = 10, + [SPECIES_RIBOMBEE] = 6, + [SPECIES_COMFEY] = 8, + [SPECIES_MINIOR_METEOR_RED] = 17, [SPECIES_MINIOR_METEOR_ORANGE] = 17, [SPECIES_MINIOR_METEOR_YELLOW] = 17, [SPECIES_MINIOR_METEOR_GREEN] = 17, @@ -264,9 +225,46 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_MINIOR_CORE_BLUE] = 17, [SPECIES_MINIOR_CORE_INDIGO] = 17, [SPECIES_MINIOR_CORE_VIOLET] = 17, + [SPECIES_DHELMISE] = 2, + [SPECIES_TAPU_KOKO] = 9, + [SPECIES_TAPU_LELE] = 8, + [SPECIES_TAPU_BULU] = 5, + [SPECIES_TAPU_FINI] = 6, + [SPECIES_COSMOG] = 7, + [SPECIES_COSMOEM] = 3, + [SPECIES_LUNALA] = 6, + [SPECIES_NIHILEGO] = 6, + [SPECIES_KARTANA] = 3, + [SPECIES_NECROZMA] = 6, [SPECIES_NECROZMA_DAWN_WINGS] = 6, [SPECIES_NECROZMA_ULTRA] = 5, - [SPECIES_SINISTEA_ANTIQUE] = 10, - [SPECIES_POLTEAGEIST_ANTIQUE] = 12, + [SPECIES_POIPOLE] = 9, + [SPECIES_NAGANADEL] = 7, + // Gen 8 + [SPECIES_CORVISQUIRE] = 10, + [SPECIES_ORBEETLE] = 8, + [SPECIES_FLAPPLE] = 9, + [SPECIES_SINISTEA_PHONY] = 9, + [SPECIES_SINISTEA_ANTIQUE] = 10, // Slightly higher to distinguish from Phony + [SPECIES_POLTEAGEIST_PHONY] = 11, + [SPECIES_POLTEAGEIST_ANTIQUE] = 12, // Slightly higher to distinguish from Phony + [SPECIES_RUNERIGUS] = 5, + [SPECIES_MILCERY] = 10, + [SPECIES_FROSMOTH] = 7, + [SPECIES_DREEPY] = 5, + [SPECIES_DRAKLOAK] = 5, + [SPECIES_DRAGAPULT] = 3, + [SPECIES_ETERNATUS] = 4, + [SPECIES_REGIELEKI] = 8, + [SPECIES_REGIDRAGO] = 5, + // Galarian Forms + [SPECIES_WEEZING_GALARIAN] = 6, + [SPECIES_ARTICUNO_GALARIAN] = 10, + [SPECIES_YAMASK_GALARIAN] = 4, + // Hisuian Forms + [SPECIES_VOLTORB_HISUIAN] = 1, + [SPECIES_ELECTRODE_HISUIAN] = 4, + [SPECIES_BRAVIARY_HISUIAN] = 3, + // Other Forms [SPECIES_ETERNATUS_ETERNAMAX] = 13, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index e2ee5c9478..2e8900bc90 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -8,31 +8,56 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_BULBASAUR] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_IVYSAUR] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_VENUSAUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_CHARMANDER] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_CHARMELEON] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_CHARIZARD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CHARIZARD_MEGA_X] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CHARIZARD_MEGA_Y] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SQUIRTLE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_WARTORTLE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_BLASTOISE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_BLASTOISE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CATERPIE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_METAPOD] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_BUTTERFREE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 10 }, [SPECIES_WEEDLE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_KAKUNA] = { .size = MON_COORDS_SIZE(24, 48), .y_offset = 11 }, [SPECIES_BEEDRILL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_BEEDRILL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_PIDGEY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_PIDGEOTTO] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_PIDGEOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_PIDGEOT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_RATTATA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, + [SPECIES_RATTATA_ALOLAN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_RATICATE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_RATICATE_ALOLAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_SPEAROW] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_FEAROW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_EKANS] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_ARBOK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_PIKACHU] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_COSPLAY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_ROCK_STAR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_BELLE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_POP_STAR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_PH_D] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_LIBRE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_ORIGINAL_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_HOENN_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_SINNOH_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_UNOVA_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_KALOS_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_ALOLA_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_PARTNER_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_PIKACHU_WORLD_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_RAICHU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_RAICHU_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SANDSHREW] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_SANDSHREW_ALOLAN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_SANDSLASH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_SANDSLASH_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_NIDORAN_F] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_NIDORINA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, [SPECIES_NIDOQUEEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -42,7 +67,9 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CLEFAIRY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_CLEFABLE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_VULPIX] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, + [SPECIES_VULPIX_ALOLAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_NINETALES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_NINETALES_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_JIGGLYPUFF] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_WIGGLYTUFF] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 4 }, [SPECIES_ZUBAT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 16 }, @@ -55,21 +82,29 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_VENONAT] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 8 }, [SPECIES_VENOMOTH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_DIGLETT] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 17 }, + [SPECIES_DIGLETT_ALOLAN] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 19 }, [SPECIES_DUGTRIO] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_DUGTRIO_ALOLAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_MEOWTH] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, + [SPECIES_MEOWTH_ALOLAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, + [SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PERSIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_PERSIAN_ALOLAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_PSYDUCK] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_GOLDUCK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MANKEY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_PRIMEAPE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GROWLITHE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_GROWLITHE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 6 }, [SPECIES_ARCANINE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_POLIWAG] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_POLIWHIRL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_POLIWRATH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_ABRA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_KADABRA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_ALAKAZAM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ALAKAZAM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MACHOP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_MACHOKE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_MACHAMP] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -79,47 +114,65 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_TENTACOOL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_TENTACRUEL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_GEODUDE] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 19 }, + [SPECIES_GEODUDE_ALOLAN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, [SPECIES_GRAVELER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_GRAVELER_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_GOLEM] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_GOLEM_ALOLAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_PONYTA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, + [SPECIES_PONYTA_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_RAPIDASH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RAPIDASH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SLOWPOKE] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 16 }, + [SPECIES_SLOWPOKE_GALARIAN] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 19 }, [SPECIES_SLOWBRO] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, + [SPECIES_SLOWBRO_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_SLOWBRO_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_MAGNEMITE] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 20 }, [SPECIES_MAGNETON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_FARFETCHD] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, + [SPECIES_FARFETCHD_GALARIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_DODUO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_DODRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SEEL] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_DEWGONG] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_GRIMER] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, + [SPECIES_GRIMER_ALOLAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_MUK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_MUK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SHELLDER] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_CLOYSTER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_GASTLY] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, [SPECIES_HAUNTER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, [SPECIES_GENGAR] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_GENGAR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_ONIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_DROWZEE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_HYPNO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_KRABBY] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 14 }, [SPECIES_KINGLER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_VOLTORB] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 11 }, + [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 0 }, [SPECIES_ELECTRODE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, + [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 0 }, [SPECIES_EXEGGCUTE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_EXEGGUTOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CUBONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_MAROWAK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 8 }, + [SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_HITMONLEE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_HITMONCHAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_LICKITUNG] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_KOFFING] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_WEEZING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_WEEZING_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_RHYHORN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_RHYDON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_CHANSEY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_TANGELA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_KANGASKHAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_KANGASKHAN_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_HORSEA] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_SEADRA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GOLDEEN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, @@ -127,14 +180,17 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_STARYU] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_STARMIE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_MR_MIME] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, + [SPECIES_MR_MIME_GALARIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_SCYTHER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_JYNX] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_ELECTABUZZ] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_MAGMAR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_PINSIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_PINSIR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_TAUROS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_MAGIKARP] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_GYARADOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_GYARADOS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LAPRAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_DITTO] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_EEVEE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, @@ -147,14 +203,20 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_KABUTO] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_KABUTOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_AERODACTYL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_AERODACTYL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_SNORLAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_ARTICUNO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ARTICUNO_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_ZAPDOS] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_ZAPDOS_GALARIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, [SPECIES_MOLTRES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_MOLTRES_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_DRATINI] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_DRAGONAIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_DRAGONITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MEWTWO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MEWTWO_MEGA_X] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, + [SPECIES_MEWTWO_MEGA_Y] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, [SPECIES_MEW] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_CHIKORITA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_BAYLEEF] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, @@ -162,6 +224,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CYNDAQUIL] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_QUILAVA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_TYPHLOSION] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, [SPECIES_TOTODILE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_CROCONAW] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 5 }, [SPECIES_FERALIGATR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -177,6 +240,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CHINCHOU] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 12 }, [SPECIES_LANTURN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_PICHU] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, + [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_CLEFFA] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 18 }, [SPECIES_IGGLYBUFF] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 17 }, [SPECIES_TOGEPI] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 16 }, @@ -186,6 +250,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MAREEP] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 12 }, [SPECIES_FLAAFFY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_AMPHAROS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_AMPHAROS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BELLOSSOM] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 12 }, [SPECIES_MARILL] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, [SPECIES_AZUMARILL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 6 }, @@ -204,6 +269,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UMBREON] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, [SPECIES_MURKROW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_SLOWKING] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, + [SPECIES_SLOWKING_GALARIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, [SPECIES_MISDREAVUS] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 13 }, [SPECIES_UNOWN] = { .size = MON_COORDS_SIZE(24, 40), .y_offset = 15 }, [SPECIES_UNOWN_B] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 16 }, @@ -240,13 +306,18 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_DUNSPARCE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_GLIGAR] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_STEELIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_STEELIX_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SNUBBULL] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_GRANBULL] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_QWILFISH] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, + [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 8 }, [SPECIES_SCIZOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_SCIZOR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SHUCKLE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_HERACROSS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_HERACROSS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SNEASEL] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, + [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_TEDDIURSA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_URSARING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SLUGMA] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 12 }, @@ -254,6 +325,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SWINUB] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 18 }, [SPECIES_PILOSWINE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, [SPECIES_CORSOLA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, + [SPECIES_CORSOLA_GALARIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_REMORAID] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_OCTILLERY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_DELIBIRD] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, @@ -261,6 +333,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SKARMORY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_HOUNDOUR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, [SPECIES_HOUNDOOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_HOUNDOOM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KINGDRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_PHANPY] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_DONPHAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, @@ -280,22 +353,28 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_LARVITAR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_PUPITAR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, [SPECIES_TYRANITAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TYRANITAR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LUGIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_HO_OH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CELEBI] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_TREECKO] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, [SPECIES_GROVYLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_SCEPTILE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SCEPTILE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TORCHIC] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 12 }, [SPECIES_COMBUSKEN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_BLAZIKEN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_BLAZIKEN_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MUDKIP] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_MARSHTOMP] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_SWAMPERT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_SWAMPERT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_POOCHYENA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_MIGHTYENA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ZIGZAGOON] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, + [SPECIES_ZIGZAGOON_GALARIAN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_LINOONE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, + [SPECIES_LINOONE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_WURMPLE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_SILCOON] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_BEAUTIFLY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, @@ -314,6 +393,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_RALTS] = { .size = MON_COORDS_SIZE(24, 40), .y_offset = 12 }, [SPECIES_KIRLIA] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 6 }, [SPECIES_GARDEVOIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GARDEVOIR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SURSKIT] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, [SPECIES_MASQUERAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SHROOMISH] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, @@ -334,14 +414,19 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SKITTY] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_DELCATTY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_SABLEYE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, + [SPECIES_SABLEYE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_MAWILE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, + [SPECIES_MAWILE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_ARON] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_LAIRON] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_AGGRON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_AGGRON_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MEDITITE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_MEDICHAM] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, + [SPECIES_MEDICHAM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ELECTRIKE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MANECTRIC] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_MANECTRIC_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_PLUSLE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_MINUN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_VOLBEAT] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, @@ -351,10 +436,12 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SWALOT] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_CARVANHA] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_SHARPEDO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SHARPEDO_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WAILMER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_WAILORD] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_NUMEL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, [SPECIES_CAMERUPT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_CAMERUPT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_TORKOAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SPOINK] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 }, [SPECIES_GRUMPIG] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, @@ -366,6 +453,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CACTURNE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SWABLU] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_ALTARIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_ALTARIA_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ZANGOOSE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_SEVIPER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_LUNATONE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, @@ -389,14 +477,17 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_KECLEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 5 }, [SPECIES_SHUPPET] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_BANETTE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_BANETTE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DUSKULL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 12 }, [SPECIES_DUSCLOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_TROPIUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CHIMECHO] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_ABSOL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_ABSOL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_WYNAUT] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_SNORUNT] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 12 }, [SPECIES_GLALIE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, + [SPECIES_GLALIE_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_SPHEAL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_SEALEO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_WALREIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -408,24 +499,30 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_BAGON] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 }, [SPECIES_SHELGON] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_SALAMENCE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_SALAMENCE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_BELDUM] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_METANG] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_METAGROSS] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_METAGROSS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_REGIROCK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_REGICE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_REGISTEEL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_LATIAS] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, + [SPECIES_LATIAS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LATIOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LATIOS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KYOGRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_KYOGRE_PRIMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GROUDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GROUDON_PRIMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_RAYQUAZA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RAYQUAZA_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_JIRACHI] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, - [SPECIES_DEOXYS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DEOXYS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DEOXYS_ATTACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DEOXYS_DEFENSE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_DEOXYS_SPEED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, #if P_GEN_4_POKEMON == TRUE -// Diamond and Pearl [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_GROTLE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_TORTERRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -468,13 +565,14 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CHERRIM_SUNSHINE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_SHELLOS_WEST_SEA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_SHELLOS_EAST_SEA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, - [SPECIES_GASTRODON] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, + [SPECIES_GASTRODON_WEST_SEA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, [SPECIES_GASTRODON_EAST_SEA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_AMBIPOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_DRIFLOON] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 7 }, [SPECIES_DRIFBLIM] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_BUNEARY] = { .size = MON_COORDS_SIZE(32, 64), .y_offset = 9 }, [SPECIES_LOPUNNY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, + [SPECIES_LOPUNNY_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_MISMAGIUS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_HONCHKROW] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GLAMEOW] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, @@ -492,9 +590,11 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_GIBLE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_GABITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_GARCHOMP] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GARCHOMP_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MUNCHLAX] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_RIOLU] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_LUCARIO] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, + [SPECIES_LUCARIO_MEGA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_HIPPOPOTAS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_HIPPOWDON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SKORUPI] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, @@ -507,6 +607,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MANTYKE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, [SPECIES_SNOVER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_ABOMASNOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ABOMASNOW_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_WEAVILE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_MAGNEZONE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_LICKILICKY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -522,6 +623,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MAMOSWINE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_PORYGON_Z] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 6 }, [SPECIES_GALLADE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_GALLADE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_PROBOPASS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_DUSKNOIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_FROSLASS] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, @@ -530,7 +632,9 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MESPRIT] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_AZELF] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, [SPECIES_DIALGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DIALGA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PALKIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_PALKIA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_HEATRAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_REGIGIGAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_GIRATINA_ALTERED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -538,7 +642,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 8 }, [SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 10 }, [SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_SHAYMIN] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, + [SPECIES_SHAYMIN_LAND] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_ARCEUS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ARCEUS_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ARCEUS_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -556,7 +660,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_ARCEUS_ICE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ARCEUS_DRAGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ARCEUS_DARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -// Platinum + [SPECIES_ARCEUS_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ROTOM_HEAT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_ROTOM_WASH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_ROTOM_FROST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, @@ -565,11 +669,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SHAYMIN_SKY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, #endif -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, - #if P_GEN_5_POKEMON == TRUE -// Black and White [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 10 }, [SPECIES_SNIVY] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_SERVINE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, @@ -580,6 +680,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_OSHAWOTT] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_DEWOTT] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, [SPECIES_SAMUROTT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PATRAT] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_WATCHOG] = { .size = MON_COORDS_SIZE(32, 64), .y_offset = 2 }, [SPECIES_LILLIPUP] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 12 }, @@ -608,6 +709,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_DRILBUR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_EXCADRILL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_AUDINO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, + [SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 6 }, [SPECIES_TIMBURR] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, [SPECIES_GURDURR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CONKELDURR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, @@ -626,14 +728,19 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_WHIMSICOTT] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_PETILIL] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 12 }, [SPECIES_LILLIGANT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_BASCULIN_RED_STRIPED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_BASCULIN_BLUE_STRIPED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 16 }, + [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 10 }, [SPECIES_SANDILE] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 18 }, [SPECIES_KROKOROK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_KROOKODILE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DARUMAKA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, - [SPECIES_DARMANITAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, + [SPECIES_DARMANITAN_STANDARD_MODE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_DARMANITAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_MARACTUS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_DWEBBLE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_CRUSTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -641,6 +748,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SCRAFTY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_SIGILYPH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_YAMASK] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, + [SPECIES_YAMASK_GALARIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, [SPECIES_COFAGRIGUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TIRTOUGA] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 16 }, [SPECIES_CARRACOSTA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, @@ -649,7 +757,9 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_TRUBBISH] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_GARBODOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_ZORUA] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, + [SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_ZOROARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_MINCCINO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_CINCCINO] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_GOTHITA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, @@ -663,11 +773,11 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_VANILLITE] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_VANILLISH] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 5 }, [SPECIES_VANILLUXE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_DEERLING] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, + [SPECIES_DEERLING_SPRING] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, [SPECIES_DEERLING_SUMMER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, [SPECIES_DEERLING_AUTUMN] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, [SPECIES_DEERLING_WINTER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, - [SPECIES_SAWSBUCK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_SAWSBUCK_SPRING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_SAWSBUCK_SUMMER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SAWSBUCK_AUTUMN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SAWSBUCK_WINTER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, @@ -703,6 +813,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SHELMET] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_ACCELGOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_STUNFISK] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 14 }, + [SPECIES_STUNFISK_GALARIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MIENFOO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_MIENSHAO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_DRUDDIGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, @@ -713,6 +824,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_BOUFFALANT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_RUFFLET] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 10 }, [SPECIES_BRAVIARY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_VULLABY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_MANDIBUZZ] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, [SPECIES_HEATMOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, @@ -725,21 +837,20 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_COBALION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, [SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_VIRIZION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_TORNADUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_THUNDURUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_TORNADUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_THUNDURUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_RESHIRAM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_ZEKROM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LANDORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_LANDORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_KYUREM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_KELDEO] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_MELOETTA] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 }, + [SPECIES_KELDEO_ORDINARY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, + [SPECIES_MELOETTA_ARIA] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 }, [SPECIES_MELOETTA_PIROUETTE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 2 }, [SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_GENESECT_DOUSE_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_GENESECT_SHOCK_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_GENESECT_BURN_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_GENESECT_CHILL_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, -// Black 2 and White 2 [SPECIES_TORNADUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_THUNDURUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_LANDORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -748,7 +859,6 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_KELDEO_RESOLUTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, #endif #if P_GEN_6_POKEMON == TRUE -// X and Y [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_QUILLADIN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_CHESNAUGHT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, @@ -758,6 +868,8 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_FROAKIE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_FROGADIER] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_GRENINJA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_GRENINJA_BATTLE_BOND] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_GRENINJA_ASH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BUNNELBY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, [SPECIES_DIGGERSBY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FLETCHLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, @@ -765,22 +877,65 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_TALONFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_SCATTERBUG] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 13 }, [SPECIES_SPEWPA] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_VIVILLON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_ICY_SNOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_POLAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_TUNDRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_CONTINENTAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_GARDEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_ELEGANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_MEADOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_MODERN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_MARINE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_ARCHIPELAGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_HIGH_PLAINS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_SANDSTORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_RIVER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_MONSOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_SAVANNA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_SUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_OCEAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_JUNGLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_FANCY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_POKE_BALL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LITLEO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_PYROAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLABEBE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_FLOETTE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, - [SPECIES_FLORGES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLABEBE_RED_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, + [SPECIES_FLABEBE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, + [SPECIES_FLABEBE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, + [SPECIES_FLABEBE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, + [SPECIES_FLABEBE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, + [SPECIES_FLOETTE_RED_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FLOETTE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FLOETTE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FLOETTE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FLOETTE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FLOETTE_ETERNAL_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_FLORGES_RED_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLORGES_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLORGES_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLORGES_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLORGES_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SKIDDO] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_GOGOAT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_PANCHAM] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 12 }, [SPECIES_PANGORO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FURFROU] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FURFROU_NATURAL] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FURFROU_HEART_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_FURFROU_STAR_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_FURFROU_DIAMOND_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_FURFROU_DEBUTANTE_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_FURFROU_MATRON_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_FURFROU_DANDY_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_FURFROU_LA_REINE_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_FURFROU_KABUKI_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_FURFROU_PHARAOH_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_ESPURR] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 10 }, - [SPECIES_MEOWSTIC] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_MEOWSTIC_MALE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_MEOWSTIC_FEMALE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_HONEDGE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_DOUBLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_AEGISLASH] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_AEGISLASH_SHIELD] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_AEGISLASH_BLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SPRITZEE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, [SPECIES_AROMATISSE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_SWIRLIX] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, @@ -805,27 +960,44 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CARBINK] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_GOOMY] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 13 }, [SPECIES_SLIGGOO] = { .size = MON_COORDS_SIZE(32, 64), .y_offset = 6 }, + [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_GOODRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_KLEFKI] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 4 }, [SPECIES_PHANTUMP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_TREVENANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_PUMPKABOO] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, - [SPECIES_GOURGEIST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_PUMPKABOO_AVERAGE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, + [SPECIES_PUMPKABOO_SMALL] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, + [SPECIES_PUMPKABOO_LARGE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, + [SPECIES_PUMPKABOO_SUPER] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, + [SPECIES_GOURGEIST_AVERAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_GOURGEIST_SMALL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 5 }, + [SPECIES_GOURGEIST_LARGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_GOURGEIST_SUPER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BERGMITE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_AVALUGG] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 5 }, [SPECIES_NOIBAT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_NOIVERN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_XERNEAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_XERNEAS_NEUTRAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_XERNEAS_ACTIVE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_YVELTAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ZYGARDE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ZYGARDE_50] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ZYGARDE_10] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ZYGARDE_COMPLETE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DIANCIE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 1 }, - [SPECIES_HOOPA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_HOOPA_CONFINED] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_HOOPA_UNBOUND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_VOLCANION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif #if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 12 }, [SPECIES_DARTRIX] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, [SPECIES_DECIDUEYE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, + [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LITTEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_TORRACAT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_INCINEROAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -842,12 +1014,19 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_VIKAVOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_CRABRAWLER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ORICORIO] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_ORICORIO_BAILE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_ORICORIO_POM_POM] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, + [SPECIES_ORICORIO_PAU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, + [SPECIES_ORICORIO_SENSU] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 16 }, [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_LYCANROC] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_WISHIWASHI] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, + [SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, + [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, + [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, + [SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_MAREANIE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_TOXAPEX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MUDBRAY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, @@ -874,12 +1053,43 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_PALOSSAND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PYUKUMUKU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_TYPE_NULL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_SILVALLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MINIOR] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_SILVALLY_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_POISON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_GROUND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_ROCK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_BUG] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_GHOST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_STEEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_FIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_WATER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_GRASS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_ELECTRIC] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_PSYCHIC] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_ICE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_DRAGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_DARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SILVALLY_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_METEOR_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, - [SPECIES_MIMIKYU] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, + [SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, + [SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, @@ -902,7 +1112,11 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_KARTANA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_GUZZLORD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_NECROZMA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_NECROZMA_DUSK_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_NECROZMA_DAWN_WINGS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_NECROZMA_ULTRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MAGEARNA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_MARSHADOW] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 9 }, [SPECIES_POIPOLE] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 8 }, [SPECIES_NAGANADEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -949,16 +1163,21 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SILICOBRA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_SANDACONDA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_CRAMORANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CRAMORANT_GULPING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CRAMORANT_GORGING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ARROKUDA] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 13 }, [SPECIES_BARRASKEWDA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_TOXEL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_TOXTRICITY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, + [SPECIES_TOXTRICITY_AMPED] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, + [SPECIES_TOXTRICITY_LOW_KEY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_SIZZLIPEDE] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, [SPECIES_CENTISKORCH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CLOBBOPUS] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_GRAPPLOCT] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 5 }, - [SPECIES_SINISTEA] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 17 }, - [SPECIES_POLTEAGEIST] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_SINISTEA_PHONY] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 17 }, + [SPECIES_SINISTEA_ANTIQUE] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 17 }, + [SPECIES_POLTEAGEIST_PHONY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_POLTEAGEIST_ANTIQUE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_HATENNA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, [SPECIES_HATTREM] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_HATTERENE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, @@ -972,15 +1191,26 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MR_RIME] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 4 }, [SPECIES_RUNERIGUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MILCERY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, - [SPECIES_ALCREMIE] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, [SPECIES_FALINKS] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_PINCURCHIN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_SNOM] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 20 }, [SPECIES_FROSMOTH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_STONJOURNER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_EISCUE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, - [SPECIES_INDEEDEE] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 9 }, - [SPECIES_MORPEKO] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, + [SPECIES_EISCUE_ICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, + [SPECIES_EISCUE_NOICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, + [SPECIES_INDEEDEE_MALE] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 9 }, + [SPECIES_INDEEDEE_FEMALE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, + [SPECIES_MORPEKO_FULL_BELLY] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, + [SPECIES_MORPEKO_HANGRY] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_CUFANT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_COPPERAJAH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_DRACOZOLT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -991,293 +1221,31 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_DREEPY] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_DRAKLOAK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_DRAGAPULT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_ZACIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ZAMAZENTA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_ZACIAN_CROWNED_SWORD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_ETERNATUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_ETERNATUS_ETERNAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_KUBFU] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, - [SPECIES_URSHIFU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_ZARUDE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ZARUDE_DADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_REGIELEKI] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_REGIDRAGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_GLASTRIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SPECTRIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CALYREX] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WYRDEER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_BASCULEGION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ENAMORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif - [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_CHARIZARD_MEGA_X] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CHARIZARD_MEGA_Y] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BLASTOISE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BEEDRILL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_PIDGEOT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ALAKAZAM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SLOWBRO_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_GENGAR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_KANGASKHAN_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_PINSIR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_GYARADOS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_AERODACTYL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_MEWTWO_MEGA_X] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_MEWTWO_MEGA_Y] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, - [SPECIES_AMPHAROS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_STEELIX_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SCIZOR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_HERACROSS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_HOUNDOOM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TYRANITAR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SCEPTILE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BLAZIKEN_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SWAMPERT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_GARDEVOIR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SABLEYE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_MAWILE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_AGGRON_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MEDICHAM_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MANECTRIC_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_SHARPEDO_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CAMERUPT_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_ALTARIA_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BANETTE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ABSOL_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_GLALIE_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_SALAMENCE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_METAGROSS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LATIAS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LATIOS_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_GARCHOMP_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LUCARIO_MEGA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_ABOMASNOW_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_GALLADE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 6 }, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif - [SPECIES_RAYQUAZA_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_KYOGRE_PRIMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GROUDON_PRIMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_RATTATA_ALOLAN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_RATICATE_ALOLAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, - [SPECIES_RAICHU_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SANDSHREW_ALOLAN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, - [SPECIES_SANDSLASH_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_VULPIX_ALOLAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, - [SPECIES_NINETALES_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_DIGLETT_ALOLAN] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 19 }, - [SPECIES_DUGTRIO_ALOLAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, - [SPECIES_MEOWTH_ALOLAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, - [SPECIES_PERSIAN_ALOLAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_GEODUDE_ALOLAN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, - [SPECIES_GRAVELER_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_GOLEM_ALOLAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_GRIMER_ALOLAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, - [SPECIES_MUK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PONYTA_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_RAPIDASH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SLOWPOKE_GALARIAN] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 19 }, - [SPECIES_SLOWBRO_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_FARFETCHD_GALARIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_WEEZING_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MR_MIME_GALARIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, - [SPECIES_ARTICUNO_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_ZAPDOS_GALARIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_MOLTRES_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_SLOWKING_GALARIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_CORSOLA_GALARIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, - [SPECIES_ZIGZAGOON_GALARIAN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, - [SPECIES_LINOONE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, - [SPECIES_DARMANITAN_GALARIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_YAMASK_GALARIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, - [SPECIES_STUNFISK_GALARIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, -#endif -// Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 6 }, - [SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 0 }, - [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 0 }, - [SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 8 }, - [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 5 }, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif - [SPECIES_PIKACHU_COSPLAY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_ROCK_STAR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_BELLE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_POP_STAR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_PH_D] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_LIBRE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_ORIGINAL_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_HOENN_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_SINNOH_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_UNOVA_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_KALOS_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_ALOLA_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_PARTNER_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - [SPECIES_PIKACHU_WORLD_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_DIALGA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_PALKIA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ARCEUS_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 10 }, - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_GRENINJA_BATTLE_BOND] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_GRENINJA_ASH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_POLAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_TUNDRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_CONTINENTAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_GARDEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_ELEGANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_MEADOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_MODERN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_MARINE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_ARCHIPELAGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_HIGH_PLAINS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_SANDSTORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_RIVER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_MONSOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_SAVANNA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_SUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_OCEAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_JUNGLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_FANCY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_VIVILLON_POKE_BALL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLABEBE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_FLABEBE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_FLABEBE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_FLABEBE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_FLOETTE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, - [SPECIES_FLOETTE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, - [SPECIES_FLOETTE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, - [SPECIES_FLOETTE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, - [SPECIES_FLOETTE_ETERNAL_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_FLORGES_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLORGES_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLORGES_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLORGES_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FURFROU_HEART_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_FURFROU_STAR_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_FURFROU_DIAMOND_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_FURFROU_DEBUTANTE_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_FURFROU_MATRON_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_FURFROU_DANDY_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_FURFROU_LA_REINE_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_FURFROU_KABUKI_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_FURFROU_PHARAOH_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_MEOWSTIC_FEMALE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_AEGISLASH_BLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_PUMPKABOO_SMALL] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, - [SPECIES_PUMPKABOO_LARGE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, - [SPECIES_PUMPKABOO_SUPER] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, - [SPECIES_GOURGEIST_SMALL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 5 }, - [SPECIES_GOURGEIST_LARGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_GOURGEIST_SUPER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_XERNEAS_ACTIVE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ZYGARDE_10] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ZYGARDE_COMPLETE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_HOOPA_UNBOUND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_ORICORIO_POM_POM] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_ORICORIO_PAU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, - [SPECIES_ORICORIO_SENSU] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_SILVALLY_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_POISON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_GROUND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_ROCK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_BUG] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_GHOST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_STEEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_FIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_WATER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_GRASS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_ELECTRIC] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_PSYCHIC] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_ICE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_DRAGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_DARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SILVALLY_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MINIOR_METEOR_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_METEOR_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, - [SPECIES_NECROZMA_DUSK_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_NECROZMA_DAWN_WINGS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_NECROZMA_ULTRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, -#endif -#if P_GEN_8_POKEMON == TRUE - [SPECIES_CRAMORANT_GULPING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CRAMORANT_GORGING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOXTRICITY_LOW_KEY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_SINISTEA_ANTIQUE] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 17 }, - [SPECIES_POLTEAGEIST_ANTIQUE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_EISCUE_NOICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, - [SPECIES_INDEEDEE_FEMALE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, - [SPECIES_MORPEKO_HANGRY] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, - [SPECIES_ZACIAN_CROWNED_SWORD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_ETERNATUS_ETERNAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_ZARUDE_DADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 35add8db79..3eca4429e6 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -3,31 +3,56 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BULBASAUR] = _("Bulbasaur"), [SPECIES_IVYSAUR] = _("Ivysaur"), [SPECIES_VENUSAUR] = _("Venusaur"), + [SPECIES_VENUSAUR_MEGA] = _("Venusaur"), [SPECIES_CHARMANDER] = _("Charmander"), [SPECIES_CHARMELEON] = _("Charmeleon"), [SPECIES_CHARIZARD] = _("Charizard"), + [SPECIES_CHARIZARD_MEGA_X] = _("Charizard"), + [SPECIES_CHARIZARD_MEGA_Y] = _("Charizard"), [SPECIES_SQUIRTLE] = _("Squirtle"), [SPECIES_WARTORTLE] = _("Wartortle"), [SPECIES_BLASTOISE] = _("Blastoise"), + [SPECIES_BLASTOISE_MEGA] = _("Blastoise"), [SPECIES_CATERPIE] = _("Caterpie"), [SPECIES_METAPOD] = _("Metapod"), [SPECIES_BUTTERFREE] = _("Butterfree"), [SPECIES_WEEDLE] = _("Weedle"), [SPECIES_KAKUNA] = _("Kakuna"), [SPECIES_BEEDRILL] = _("Beedrill"), + [SPECIES_BEEDRILL_MEGA] = _("Beedrill"), [SPECIES_PIDGEY] = _("Pidgey"), [SPECIES_PIDGEOTTO] = _("Pidgeotto"), [SPECIES_PIDGEOT] = _("Pidgeot"), + [SPECIES_PIDGEOT_MEGA] = _("Pidgeot"), [SPECIES_RATTATA] = _("Rattata"), + [SPECIES_RATTATA_ALOLAN] = _("Rattata"), [SPECIES_RATICATE] = _("Raticate"), + [SPECIES_RATICATE_ALOLAN] = _("Raticate"), [SPECIES_SPEAROW] = _("Spearow"), [SPECIES_FEAROW] = _("Fearow"), [SPECIES_EKANS] = _("Ekans"), [SPECIES_ARBOK] = _("Arbok"), [SPECIES_PIKACHU] = _("Pikachu"), + [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), + [SPECIES_PIKACHU_ROCK_STAR] = _("Pikachu"), + [SPECIES_PIKACHU_BELLE] = _("Pikachu"), + [SPECIES_PIKACHU_POP_STAR] = _("Pikachu"), + [SPECIES_PIKACHU_PH_D] = _("Pikachu"), + [SPECIES_PIKACHU_LIBRE] = _("Pikachu"), + [SPECIES_PIKACHU_ORIGINAL_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_HOENN_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_SINNOH_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_UNOVA_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_KALOS_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_ALOLA_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_PARTNER_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_WORLD_CAP] = _("Pikachu"), [SPECIES_RAICHU] = _("Raichu"), + [SPECIES_RAICHU_ALOLAN] = _("Raichu"), [SPECIES_SANDSHREW] = _("Sandshrew"), + [SPECIES_SANDSHREW_ALOLAN] = _("Sandshrew"), [SPECIES_SANDSLASH] = _("Sandslash"), + [SPECIES_SANDSLASH_ALOLAN] = _("Sandslash"), [SPECIES_NIDORAN_F] = _("Nidoran♀"), [SPECIES_NIDORINA] = _("Nidorina"), [SPECIES_NIDOQUEEN] = _("Nidoqueen"), @@ -37,7 +62,9 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CLEFAIRY] = _("Clefairy"), [SPECIES_CLEFABLE] = _("Clefable"), [SPECIES_VULPIX] = _("Vulpix"), + [SPECIES_VULPIX_ALOLAN] = _("Vulpix"), [SPECIES_NINETALES] = _("Ninetales"), + [SPECIES_NINETALES_ALOLAN] = _("Ninetales"), [SPECIES_JIGGLYPUFF] = _("Jigglypuff"), [SPECIES_WIGGLYTUFF] = _("Wigglytuff"), [SPECIES_ZUBAT] = _("Zubat"), @@ -50,21 +77,29 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_VENONAT] = _("Venonat"), [SPECIES_VENOMOTH] = _("Venomoth"), [SPECIES_DIGLETT] = _("Diglett"), + [SPECIES_DIGLETT_ALOLAN] = _("Diglett"), [SPECIES_DUGTRIO] = _("Dugtrio"), + [SPECIES_DUGTRIO_ALOLAN] = _("Dugtrio"), [SPECIES_MEOWTH] = _("Meowth"), + [SPECIES_MEOWTH_ALOLAN] = _("Meowth"), + [SPECIES_MEOWTH_GALARIAN] = _("Meowth"), [SPECIES_PERSIAN] = _("Persian"), + [SPECIES_PERSIAN_ALOLAN] = _("Persian"), [SPECIES_PSYDUCK] = _("Psyduck"), [SPECIES_GOLDUCK] = _("Golduck"), [SPECIES_MANKEY] = _("Mankey"), [SPECIES_PRIMEAPE] = _("Primeape"), [SPECIES_GROWLITHE] = _("Growlithe"), + [SPECIES_GROWLITHE_HISUIAN] = _("Growlithe"), [SPECIES_ARCANINE] = _("Arcanine"), + [SPECIES_ARCANINE_HISUIAN] = _("Arcanine"), [SPECIES_POLIWAG] = _("Poliwag"), [SPECIES_POLIWHIRL] = _("Poliwhirl"), [SPECIES_POLIWRATH] = _("Poliwrath"), [SPECIES_ABRA] = _("Abra"), [SPECIES_KADABRA] = _("Kadabra"), [SPECIES_ALAKAZAM] = _("Alakazam"), + [SPECIES_ALAKAZAM_MEGA] = _("Alakazam"), [SPECIES_MACHOP] = _("Machop"), [SPECIES_MACHOKE] = _("Machoke"), [SPECIES_MACHAMP] = _("Machamp"), @@ -74,47 +109,65 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_TENTACOOL] = _("Tentacool"), [SPECIES_TENTACRUEL] = _("Tentacruel"), [SPECIES_GEODUDE] = _("Geodude"), + [SPECIES_GEODUDE_ALOLAN] = _("Geodude"), [SPECIES_GRAVELER] = _("Graveler"), + [SPECIES_GRAVELER_ALOLAN] = _("Graveler"), [SPECIES_GOLEM] = _("Golem"), + [SPECIES_GOLEM_ALOLAN] = _("Golem"), [SPECIES_PONYTA] = _("Ponyta"), + [SPECIES_PONYTA_GALARIAN] = _("Ponyta"), [SPECIES_RAPIDASH] = _("Rapidash"), + [SPECIES_RAPIDASH_GALARIAN] = _("Rapidash"), [SPECIES_SLOWPOKE] = _("Slowpoke"), + [SPECIES_SLOWPOKE_GALARIAN] = _("Slowpoke"), [SPECIES_SLOWBRO] = _("Slowbro"), + [SPECIES_SLOWBRO_GALARIAN] = _("Slowbro"), + [SPECIES_SLOWBRO_MEGA] = _("Slowbro"), [SPECIES_MAGNEMITE] = _("Magnemite"), [SPECIES_MAGNETON] = _("Magneton"), [SPECIES_FARFETCHD] = _("Farfetch'd"), + [SPECIES_FARFETCHD_GALARIAN] = _("Farfetch'd"), [SPECIES_DODUO] = _("Doduo"), [SPECIES_DODRIO] = _("Dodrio"), [SPECIES_SEEL] = _("Seel"), [SPECIES_DEWGONG] = _("Dewgong"), [SPECIES_GRIMER] = _("Grimer"), + [SPECIES_GRIMER_ALOLAN] = _("Grimer"), [SPECIES_MUK] = _("Muk"), + [SPECIES_MUK_ALOLAN] = _("Muk"), [SPECIES_SHELLDER] = _("Shellder"), [SPECIES_CLOYSTER] = _("Cloyster"), [SPECIES_GASTLY] = _("Gastly"), [SPECIES_HAUNTER] = _("Haunter"), [SPECIES_GENGAR] = _("Gengar"), + [SPECIES_GENGAR_MEGA] = _("Gengar"), [SPECIES_ONIX] = _("Onix"), [SPECIES_DROWZEE] = _("Drowzee"), [SPECIES_HYPNO] = _("Hypno"), [SPECIES_KRABBY] = _("Krabby"), [SPECIES_KINGLER] = _("Kingler"), [SPECIES_VOLTORB] = _("Voltorb"), + [SPECIES_VOLTORB_HISUIAN] = _("Voltorb"), [SPECIES_ELECTRODE] = _("Electrode"), + [SPECIES_ELECTRODE_HISUIAN] = _("Electrode"), [SPECIES_EXEGGCUTE] = _("Exeggcute"), [SPECIES_EXEGGUTOR] = _("Exeggutor"), + [SPECIES_EXEGGUTOR_ALOLAN] = _("Exeggutor"), [SPECIES_CUBONE] = _("Cubone"), [SPECIES_MAROWAK] = _("Marowak"), + [SPECIES_MAROWAK_ALOLAN] = _("Marowak"), [SPECIES_HITMONLEE] = _("Hitmonlee"), [SPECIES_HITMONCHAN] = _("Hitmonchan"), [SPECIES_LICKITUNG] = _("Lickitung"), [SPECIES_KOFFING] = _("Koffing"), [SPECIES_WEEZING] = _("Weezing"), + [SPECIES_WEEZING_GALARIAN] = _("Weezing"), [SPECIES_RHYHORN] = _("Rhyhorn"), [SPECIES_RHYDON] = _("Rhydon"), [SPECIES_CHANSEY] = _("Chansey"), [SPECIES_TANGELA] = _("Tangela"), [SPECIES_KANGASKHAN] = _("Kangaskhan"), + [SPECIES_KANGASKHAN_MEGA] = _("Kangaskhan"), [SPECIES_HORSEA] = _("Horsea"), [SPECIES_SEADRA] = _("Seadra"), [SPECIES_GOLDEEN] = _("Goldeen"), @@ -122,14 +175,17 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_STARYU] = _("Staryu"), [SPECIES_STARMIE] = _("Starmie"), [SPECIES_MR_MIME] = _("Mr. Mime"), + [SPECIES_MR_MIME_GALARIAN] = _("Mr. Mime"), [SPECIES_SCYTHER] = _("Scyther"), [SPECIES_JYNX] = _("Jynx"), [SPECIES_ELECTABUZZ] = _("Electabuzz"), [SPECIES_MAGMAR] = _("Magmar"), [SPECIES_PINSIR] = _("Pinsir"), + [SPECIES_PINSIR_MEGA] = _("Pinsir"), [SPECIES_TAUROS] = _("Tauros"), [SPECIES_MAGIKARP] = _("Magikarp"), [SPECIES_GYARADOS] = _("Gyarados"), + [SPECIES_GYARADOS_MEGA] = _("Gyarados"), [SPECIES_LAPRAS] = _("Lapras"), [SPECIES_DITTO] = _("Ditto"), [SPECIES_EEVEE] = _("Eevee"), @@ -142,14 +198,20 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_KABUTO] = _("Kabuto"), [SPECIES_KABUTOPS] = _("Kabutops"), [SPECIES_AERODACTYL] = _("Aerodactyl"), + [SPECIES_AERODACTYL_MEGA] = _("Aerodactyl"), [SPECIES_SNORLAX] = _("Snorlax"), [SPECIES_ARTICUNO] = _("Articuno"), + [SPECIES_ARTICUNO_GALARIAN] = _("Articuno"), [SPECIES_ZAPDOS] = _("Zapdos"), + [SPECIES_ZAPDOS_GALARIAN] = _("Zapdos"), [SPECIES_MOLTRES] = _("Moltres"), + [SPECIES_MOLTRES_GALARIAN] = _("Moltres"), [SPECIES_DRATINI] = _("Dratini"), [SPECIES_DRAGONAIR] = _("Dragonair"), [SPECIES_DRAGONITE] = _("Dragonite"), [SPECIES_MEWTWO] = _("Mewtwo"), + [SPECIES_MEWTWO_MEGA_X] = _("Mewtwo"), + [SPECIES_MEWTWO_MEGA_Y] = _("Mewtwo"), [SPECIES_MEW] = _("Mew"), [SPECIES_CHIKORITA] = _("Chikorita"), [SPECIES_BAYLEEF] = _("Bayleef"), @@ -157,6 +219,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CYNDAQUIL] = _("Cyndaquil"), [SPECIES_QUILAVA] = _("Quilava"), [SPECIES_TYPHLOSION] = _("Typhlosion"), + [SPECIES_TYPHLOSION_HISUIAN] = _("Typhlosion"), [SPECIES_TOTODILE] = _("Totodile"), [SPECIES_CROCONAW] = _("Croconaw"), [SPECIES_FERALIGATR] = _("Feraligatr"), @@ -172,6 +235,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CHINCHOU] = _("Chinchou"), [SPECIES_LANTURN] = _("Lanturn"), [SPECIES_PICHU] = _("Pichu"), + [SPECIES_PICHU_SPIKY_EARED] = _("Pichu"), [SPECIES_CLEFFA] = _("Cleffa"), [SPECIES_IGGLYBUFF] = _("Igglybuff"), [SPECIES_TOGEPI] = _("Togepi"), @@ -181,6 +245,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MAREEP] = _("Mareep"), [SPECIES_FLAAFFY] = _("Flaaffy"), [SPECIES_AMPHAROS] = _("Ampharos"), + [SPECIES_AMPHAROS_MEGA] = _("Ampharos"), [SPECIES_BELLOSSOM] = _("Bellossom"), [SPECIES_MARILL] = _("Marill"), [SPECIES_AZUMARILL] = _("Azumarill"), @@ -199,6 +264,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_UMBREON] = _("Umbreon"), [SPECIES_MURKROW] = _("Murkrow"), [SPECIES_SLOWKING] = _("Slowking"), + [SPECIES_SLOWKING_GALARIAN] = _("Slowking"), [SPECIES_MISDREAVUS] = _("Misdreavus"), [SPECIES_UNOWN] = _("Unown"), [SPECIES_UNOWN_B] = _("Unown"), @@ -235,13 +301,18 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DUNSPARCE] = _("Dunsparce"), [SPECIES_GLIGAR] = _("Gligar"), [SPECIES_STEELIX] = _("Steelix"), + [SPECIES_STEELIX_MEGA] = _("Steelix"), [SPECIES_SNUBBULL] = _("Snubbull"), [SPECIES_GRANBULL] = _("Granbull"), [SPECIES_QWILFISH] = _("Qwilfish"), + [SPECIES_QWILFISH_HISUIAN] = _("Qwilfish"), [SPECIES_SCIZOR] = _("Scizor"), + [SPECIES_SCIZOR_MEGA] = _("Scizor"), [SPECIES_SHUCKLE] = _("Shuckle"), [SPECIES_HERACROSS] = _("Heracross"), + [SPECIES_HERACROSS_MEGA] = _("Heracross"), [SPECIES_SNEASEL] = _("Sneasel"), + [SPECIES_SNEASEL_HISUIAN] = _("Sneasel"), [SPECIES_TEDDIURSA] = _("Teddiursa"), [SPECIES_URSARING] = _("Ursaring"), [SPECIES_SLUGMA] = _("Slugma"), @@ -249,6 +320,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SWINUB] = _("Swinub"), [SPECIES_PILOSWINE] = _("Piloswine"), [SPECIES_CORSOLA] = _("Corsola"), + [SPECIES_CORSOLA_GALARIAN] = _("Corsola"), [SPECIES_REMORAID] = _("Remoraid"), [SPECIES_OCTILLERY] = _("Octillery"), [SPECIES_DELIBIRD] = _("Delibird"), @@ -256,6 +328,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SKARMORY] = _("Skarmory"), [SPECIES_HOUNDOUR] = _("Houndour"), [SPECIES_HOUNDOOM] = _("Houndoom"), + [SPECIES_HOUNDOOM_MEGA] = _("Houndoom"), [SPECIES_KINGDRA] = _("Kingdra"), [SPECIES_PHANPY] = _("Phanpy"), [SPECIES_DONPHAN] = _("Donphan"), @@ -275,22 +348,28 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_LARVITAR] = _("Larvitar"), [SPECIES_PUPITAR] = _("Pupitar"), [SPECIES_TYRANITAR] = _("Tyranitar"), + [SPECIES_TYRANITAR_MEGA] = _("Tyranitar"), [SPECIES_LUGIA] = _("Lugia"), [SPECIES_HO_OH] = _("Ho-Oh"), [SPECIES_CELEBI] = _("Celebi"), [SPECIES_TREECKO] = _("Treecko"), [SPECIES_GROVYLE] = _("Grovyle"), [SPECIES_SCEPTILE] = _("Sceptile"), + [SPECIES_SCEPTILE_MEGA] = _("Sceptile"), [SPECIES_TORCHIC] = _("Torchic"), [SPECIES_COMBUSKEN] = _("Combusken"), [SPECIES_BLAZIKEN] = _("Blaziken"), + [SPECIES_BLAZIKEN_MEGA] = _("Blaziken"), [SPECIES_MUDKIP] = _("Mudkip"), [SPECIES_MARSHTOMP] = _("Marshtomp"), [SPECIES_SWAMPERT] = _("Swampert"), + [SPECIES_SWAMPERT_MEGA] = _("Swampert"), [SPECIES_POOCHYENA] = _("Poochyena"), [SPECIES_MIGHTYENA] = _("Mightyena"), [SPECIES_ZIGZAGOON] = _("Zigzagoon"), + [SPECIES_ZIGZAGOON_GALARIAN] = _("Zigzagoon"), [SPECIES_LINOONE] = _("Linoone"), + [SPECIES_LINOONE_GALARIAN] = _("Linoone"), [SPECIES_WURMPLE] = _("Wurmple"), [SPECIES_SILCOON] = _("Silcoon"), [SPECIES_BEAUTIFLY] = _("Beautifly"), @@ -309,6 +388,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_RALTS] = _("Ralts"), [SPECIES_KIRLIA] = _("Kirlia"), [SPECIES_GARDEVOIR] = _("Gardevoir"), + [SPECIES_GARDEVOIR_MEGA] = _("Gardevoir"), [SPECIES_SURSKIT] = _("Surskit"), [SPECIES_MASQUERAIN] = _("Masquerain"), [SPECIES_SHROOMISH] = _("Shroomish"), @@ -329,14 +409,19 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SKITTY] = _("Skitty"), [SPECIES_DELCATTY] = _("Delcatty"), [SPECIES_SABLEYE] = _("Sableye"), + [SPECIES_SABLEYE_MEGA] = _("Sableye"), [SPECIES_MAWILE] = _("Mawile"), + [SPECIES_MAWILE_MEGA] = _("Mawile"), [SPECIES_ARON] = _("Aron"), [SPECIES_LAIRON] = _("Lairon"), [SPECIES_AGGRON] = _("Aggron"), + [SPECIES_AGGRON_MEGA] = _("Aggron"), [SPECIES_MEDITITE] = _("Meditite"), [SPECIES_MEDICHAM] = _("Medicham"), + [SPECIES_MEDICHAM_MEGA] = _("Medicham"), [SPECIES_ELECTRIKE] = _("Electrike"), [SPECIES_MANECTRIC] = _("Manectric"), + [SPECIES_MANECTRIC_MEGA] = _("Manectric"), [SPECIES_PLUSLE] = _("Plusle"), [SPECIES_MINUN] = _("Minun"), [SPECIES_VOLBEAT] = _("Volbeat"), @@ -346,10 +431,12 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SWALOT] = _("Swalot"), [SPECIES_CARVANHA] = _("Carvanha"), [SPECIES_SHARPEDO] = _("Sharpedo"), + [SPECIES_SHARPEDO_MEGA] = _("Sharpedo"), [SPECIES_WAILMER] = _("Wailmer"), [SPECIES_WAILORD] = _("Wailord"), [SPECIES_NUMEL] = _("Numel"), [SPECIES_CAMERUPT] = _("Camerupt"), + [SPECIES_CAMERUPT_MEGA] = _("Camerupt"), [SPECIES_TORKOAL] = _("Torkoal"), [SPECIES_SPOINK] = _("Spoink"), [SPECIES_GRUMPIG] = _("Grumpig"), @@ -361,6 +448,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CACTURNE] = _("Cacturne"), [SPECIES_SWABLU] = _("Swablu"), [SPECIES_ALTARIA] = _("Altaria"), + [SPECIES_ALTARIA_MEGA] = _("Altaria"), [SPECIES_ZANGOOSE] = _("Zangoose"), [SPECIES_SEVIPER] = _("Seviper"), [SPECIES_LUNATONE] = _("Lunatone"), @@ -384,14 +472,17 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_KECLEON] = _("Kecleon"), [SPECIES_SHUPPET] = _("Shuppet"), [SPECIES_BANETTE] = _("Banette"), + [SPECIES_BANETTE_MEGA] = _("Banette"), [SPECIES_DUSKULL] = _("Duskull"), [SPECIES_DUSCLOPS] = _("Dusclops"), [SPECIES_TROPIUS] = _("Tropius"), [SPECIES_CHIMECHO] = _("Chimecho"), [SPECIES_ABSOL] = _("Absol"), + [SPECIES_ABSOL_MEGA] = _("Absol"), [SPECIES_WYNAUT] = _("Wynaut"), [SPECIES_SNORUNT] = _("Snorunt"), [SPECIES_GLALIE] = _("Glalie"), + [SPECIES_GLALIE_MEGA] = _("Glalie"), [SPECIES_SPHEAL] = _("Spheal"), [SPECIES_SEALEO] = _("Sealeo"), [SPECIES_WALREIN] = _("Walrein"), @@ -403,24 +494,30 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BAGON] = _("Bagon"), [SPECIES_SHELGON] = _("Shelgon"), [SPECIES_SALAMENCE] = _("Salamence"), + [SPECIES_SALAMENCE_MEGA] = _("Salamence"), [SPECIES_BELDUM] = _("Beldum"), [SPECIES_METANG] = _("Metang"), [SPECIES_METAGROSS] = _("Metagross"), + [SPECIES_METAGROSS_MEGA] = _("Metagross"), [SPECIES_REGIROCK] = _("Regirock"), [SPECIES_REGICE] = _("Regice"), [SPECIES_REGISTEEL] = _("Registeel"), [SPECIES_LATIAS] = _("Latias"), + [SPECIES_LATIAS_MEGA] = _("Latias"), [SPECIES_LATIOS] = _("Latios"), + [SPECIES_LATIOS_MEGA] = _("Latios"), [SPECIES_KYOGRE] = _("Kyogre"), + [SPECIES_KYOGRE_PRIMAL] = _("Kyogre"), [SPECIES_GROUDON] = _("Groudon"), + [SPECIES_GROUDON_PRIMAL] = _("Groudon"), [SPECIES_RAYQUAZA] = _("Rayquaza"), + [SPECIES_RAYQUAZA_MEGA] = _("Rayquaza"), [SPECIES_JIRACHI] = _("Jirachi"), [SPECIES_DEOXYS_NORMAL] = _("Deoxys"), [SPECIES_DEOXYS_ATTACK] = _("Deoxys"), [SPECIES_DEOXYS_DEFENSE] = _("Deoxys"), [SPECIES_DEOXYS_SPEED] = _("Deoxys"), #if P_GEN_4_POKEMON == TRUE -// Diamond and Pearl [SPECIES_TURTWIG] = _("Turtwig"), [SPECIES_GROTLE] = _("Grotle"), [SPECIES_TORTERRA] = _("Torterra"), @@ -463,13 +560,14 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CHERRIM_SUNSHINE] = _("Cherrim"), [SPECIES_SHELLOS_WEST_SEA] = _("Shellos"), [SPECIES_SHELLOS_EAST_SEA] = _("Shellos"), - [SPECIES_GASTRODON] = _("Gastrodon"), + [SPECIES_GASTRODON_WEST_SEA] = _("Gastrodon"), [SPECIES_GASTRODON_EAST_SEA] = _("Gastrodon"), [SPECIES_AMBIPOM] = _("Ambipom"), [SPECIES_DRIFLOON] = _("Drifloon"), [SPECIES_DRIFBLIM] = _("Drifblim"), [SPECIES_BUNEARY] = _("Buneary"), [SPECIES_LOPUNNY] = _("Lopunny"), + [SPECIES_LOPUNNY_MEGA] = _("Lopunny"), [SPECIES_MISMAGIUS] = _("Mismagius"), [SPECIES_HONCHKROW] = _("Honchkrow"), [SPECIES_GLAMEOW] = _("Glameow"), @@ -487,9 +585,11 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_GIBLE] = _("Gible"), [SPECIES_GABITE] = _("Gabite"), [SPECIES_GARCHOMP] = _("Garchomp"), + [SPECIES_GARCHOMP_MEGA] = _("Garchomp"), [SPECIES_MUNCHLAX] = _("Munchlax"), [SPECIES_RIOLU] = _("Riolu"), [SPECIES_LUCARIO] = _("Lucario"), + [SPECIES_LUCARIO_MEGA] = _("Lucario"), [SPECIES_HIPPOPOTAS] = _("Hippopotas"), [SPECIES_HIPPOWDON] = _("Hippowdon"), [SPECIES_SKORUPI] = _("Skorupi"), @@ -502,6 +602,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MANTYKE] = _("Mantyke"), [SPECIES_SNOVER] = _("Snover"), [SPECIES_ABOMASNOW] = _("Abomasnow"), + [SPECIES_ABOMASNOW_MEGA] = _("Abomasnow"), [SPECIES_WEAVILE] = _("Weavile"), [SPECIES_MAGNEZONE] = _("Magnezone"), [SPECIES_LICKILICKY] = _("Lickilicky"), @@ -517,23 +618,33 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MAMOSWINE] = _("Mamoswine"), [SPECIES_PORYGON_Z] = _("Porygon-Z"), [SPECIES_GALLADE] = _("Gallade"), + [SPECIES_GALLADE_MEGA] = _("Gallade"), [SPECIES_PROBOPASS] = _("Probopass"), [SPECIES_DUSKNOIR] = _("Dusknoir"), [SPECIES_FROSLASS] = _("Froslass"), [SPECIES_ROTOM] = _("Rotom"), + [SPECIES_ROTOM_HEAT] = _("Rotom"), + [SPECIES_ROTOM_FAN] = _("Rotom"), + [SPECIES_ROTOM_FROST] = _("Rotom"), + [SPECIES_ROTOM_MOW] = _("Rotom"), + [SPECIES_ROTOM_WASH] = _("Rotom"), [SPECIES_UXIE] = _("Uxie"), [SPECIES_MESPRIT] = _("Mesprit"), [SPECIES_AZELF] = _("Azelf"), [SPECIES_DIALGA] = _("Dialga"), + [SPECIES_DIALGA_ORIGIN] = _("Dialga"), [SPECIES_PALKIA] = _("Palkia"), + [SPECIES_PALKIA_ORIGIN] = _("Palkia"), [SPECIES_HEATRAN] = _("Heatran"), [SPECIES_REGIGIGAS] = _("Regigigas"), [SPECIES_GIRATINA_ALTERED] = _("Giratina"), + [SPECIES_GIRATINA_ORIGIN] = _("Giratina"), [SPECIES_CRESSELIA] = _("Cresselia"), [SPECIES_PHIONE] = _("Phione"), [SPECIES_MANAPHY] = _("Manaphy"), [SPECIES_DARKRAI] = _("Darkrai"), [SPECIES_SHAYMIN_LAND] = _("Shaymin"), + [SPECIES_SHAYMIN_SKY] = _("Shaymin"), [SPECIES_ARCEUS_NORMAL] = _("Arceus"), [SPECIES_ARCEUS_FIGHTING] = _("Arceus"), [SPECIES_ARCEUS_FLYING] = _("Arceus"), @@ -551,20 +662,9 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ARCEUS_ICE] = _("Arceus"), [SPECIES_ARCEUS_DRAGON] = _("Arceus"), [SPECIES_ARCEUS_DARK] = _("Arceus"), -// Platinum - [SPECIES_ROTOM_HEAT] = _("Rotom"), - [SPECIES_ROTOM_FAN] = _("Rotom"), - [SPECIES_ROTOM_FROST] = _("Rotom"), - [SPECIES_ROTOM_MOW] = _("Rotom"), - [SPECIES_ROTOM_WASH] = _("Rotom"), - [SPECIES_GIRATINA_ORIGIN] = _("Giratina"), - [SPECIES_SHAYMIN_SKY] = _("Shaymin"), + [SPECIES_ARCEUS_FAIRY] = _("Arceus"), #endif -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = _("Pichu"), - #if P_GEN_5_POKEMON == TRUE -// Black and White [SPECIES_VICTINI] = _("Victini"), [SPECIES_SNIVY] = _("Snivy"), [SPECIES_SERVINE] = _("Servine"), @@ -575,6 +675,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_OSHAWOTT] = _("Oshawott"), [SPECIES_DEWOTT] = _("Dewott"), [SPECIES_SAMUROTT] = _("Samurott"), + [SPECIES_SAMUROTT_HISUIAN] = _("Samurott"), [SPECIES_PATRAT] = _("Patrat"), [SPECIES_WATCHOG] = _("Watchog"), [SPECIES_LILLIPUP] = _("Lillipup"), @@ -603,6 +704,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DRILBUR] = _("Drilbur"), [SPECIES_EXCADRILL] = _("Excadrill"), [SPECIES_AUDINO] = _("Audino"), + [SPECIES_AUDINO_MEGA] = _("Audino"), [SPECIES_TIMBURR] = _("Timburr"), [SPECIES_GURDURR] = _("Gurdurr"), [SPECIES_CONKELDURR] = _("Conkeldurr"), @@ -621,14 +723,19 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_WHIMSICOTT] = _("Whimsicott"), [SPECIES_PETILIL] = _("Petilil"), [SPECIES_LILLIGANT] = _("Lilligant"), + [SPECIES_LILLIGANT_HISUIAN] = _("Lilligant"), [SPECIES_BASCULIN_RED_STRIPED] = _("Basculin"), [SPECIES_BASCULIN_BLUE_STRIPED] = _("Basculin"), + [SPECIES_BASCULIN_WHITE_STRIPED] = _("Basculin"), [SPECIES_SANDILE] = _("Sandile"), [SPECIES_KROKOROK] = _("Krokorok"), [SPECIES_KROOKODILE] = _("Krookodile"), [SPECIES_DARUMAKA] = _("Darumaka"), - [SPECIES_DARMANITAN] = _("Darmanitan"), + [SPECIES_DARUMAKA_GALARIAN] = _("Darumaka"), + [SPECIES_DARMANITAN_STANDARD_MODE] = _("Darmanitan"), [SPECIES_DARMANITAN_ZEN_MODE] = _("Darmanitan"), + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = _("Darmanitan"), + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = _("Darmanitan"), [SPECIES_MARACTUS] = _("Maractus"), [SPECIES_DWEBBLE] = _("Dwebble"), [SPECIES_CRUSTLE] = _("Crustle"), @@ -636,6 +743,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SCRAFTY] = _("Scrafty"), [SPECIES_SIGILYPH] = _("Sigilyph"), [SPECIES_YAMASK] = _("Yamask"), + [SPECIES_YAMASK_GALARIAN] = _("Yamask"), [SPECIES_COFAGRIGUS] = _("Cofagrigus"), [SPECIES_TIRTOUGA] = _("Tirtouga"), [SPECIES_CARRACOSTA] = _("Carracosta"), @@ -644,7 +752,9 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_TRUBBISH] = _("Trubbish"), [SPECIES_GARBODOR] = _("Garbodor"), [SPECIES_ZORUA] = _("Zorua"), + [SPECIES_ZORUA_HISUIAN] = _("Zorua"), [SPECIES_ZOROARK] = _("Zoroark"), + [SPECIES_ZOROARK_HISUIAN] = _("Zoroark"), [SPECIES_MINCCINO] = _("Minccino"), [SPECIES_CINCCINO] = _("Cinccino"), [SPECIES_GOTHITA] = _("Gothita"), @@ -658,11 +768,11 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_VANILLITE] = _("Vanillite"), [SPECIES_VANILLISH] = _("Vanillish"), [SPECIES_VANILLUXE] = _("Vanilluxe"), - [SPECIES_DEERLING] = _("Deerling"), + [SPECIES_DEERLING_SPRING] = _("Deerling"), [SPECIES_DEERLING_SUMMER] = _("Deerling"), [SPECIES_DEERLING_AUTUMN] = _("Deerling"), [SPECIES_DEERLING_WINTER] = _("Deerling"), - [SPECIES_SAWSBUCK] = _("Sawsbuck"), + [SPECIES_SAWSBUCK_SPRING] = _("Sawsbuck"), [SPECIES_SAWSBUCK_SUMMER] = _("Sawsbuck"), [SPECIES_SAWSBUCK_AUTUMN] = _("Sawsbuck"), [SPECIES_SAWSBUCK_WINTER] = _("Sawsbuck"), @@ -698,6 +808,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SHELMET] = _("Shelmet"), [SPECIES_ACCELGOR] = _("Accelgor"), [SPECIES_STUNFISK] = _("Stunfisk"), + [SPECIES_STUNFISK_GALARIAN] = _("Stunfisk"), [SPECIES_MIENFOO] = _("Mienfoo"), [SPECIES_MIENSHAO] = _("Mienshao"), [SPECIES_DRUDDIGON] = _("Druddigon"), @@ -708,6 +819,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BOUFFALANT] = _("Bouffalant"), [SPECIES_RUFFLET] = _("Rufflet"), [SPECIES_BRAVIARY] = _("Braviary"), + [SPECIES_BRAVIARY_HISUIAN] = _("Braviary"), [SPECIES_VULLABY] = _("Vullaby"), [SPECIES_MANDIBUZZ] = _("Mandibuzz"), [SPECIES_HEATMOR] = _("Heatmor"), @@ -720,14 +832,14 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_COBALION] = _("Cobalion"), [SPECIES_TERRAKION] = _("Terrakion"), [SPECIES_VIRIZION] = _("Virizion"), - [SPECIES_TORNADUS] = _("Tornadus"), - [SPECIES_THUNDURUS] = _("Thundurus"), + [SPECIES_TORNADUS_INCARNATE] = _("Tornadus"), + [SPECIES_THUNDURUS_INCARNATE] = _("Thundurus"), [SPECIES_RESHIRAM] = _("Reshiram"), [SPECIES_ZEKROM] = _("Zekrom"), - [SPECIES_LANDORUS] = _("Landorus"), + [SPECIES_LANDORUS_INCARNATE] = _("Landorus"), [SPECIES_KYUREM] = _("Kyurem"), - [SPECIES_KELDEO] = _("Keldeo"), - [SPECIES_MELOETTA] = _("Meloetta"), + [SPECIES_KELDEO_ORDINARY] = _("Keldeo"), + [SPECIES_MELOETTA_ARIA] = _("Meloetta"), [SPECIES_MELOETTA_PIROUETTE] = _("Meloetta"), [SPECIES_GENESECT] = _("Genesect"), [SPECIES_GENESECT_DOUSE_DRIVE] = _("Genesect"), @@ -755,6 +867,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_FROAKIE] = _("Froakie"), [SPECIES_FROGADIER] = _("Frogadier"), [SPECIES_GRENINJA] = _("Greninja"), + [SPECIES_GRENINJA_BATTLE_BOND] = _("Greninja"), + [SPECIES_GRENINJA_ASH] = _("Greninja"), [SPECIES_BUNNELBY] = _("Bunnelby"), [SPECIES_DIGGERSBY] = _("Diggersby"), [SPECIES_FLETCHLING] = _("Fletchling"), @@ -762,22 +876,65 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_TALONFLAME] = _("Talonflame"), [SPECIES_SCATTERBUG] = _("Scatterbug"), [SPECIES_SPEWPA] = _("Spewpa"), - [SPECIES_VIVILLON] = _("Vivillon"), + [SPECIES_VIVILLON_ICY_SNOW] = _("Vivillon"), + [SPECIES_VIVILLON_POLAR] = _("Vivillon"), + [SPECIES_VIVILLON_TUNDRA] = _("Vivillon"), + [SPECIES_VIVILLON_CONTINENTAL] = _("Vivillon"), + [SPECIES_VIVILLON_GARDEN] = _("Vivillon"), + [SPECIES_VIVILLON_ELEGANT] = _("Vivillon"), + [SPECIES_VIVILLON_MEADOW] = _("Vivillon"), + [SPECIES_VIVILLON_MODERN] = _("Vivillon"), + [SPECIES_VIVILLON_MARINE] = _("Vivillon"), + [SPECIES_VIVILLON_ARCHIPELAGO] = _("Vivillon"), + [SPECIES_VIVILLON_HIGH_PLAINS] = _("Vivillon"), + [SPECIES_VIVILLON_SANDSTORM] = _("Vivillon"), + [SPECIES_VIVILLON_RIVER] = _("Vivillon"), + [SPECIES_VIVILLON_MONSOON] = _("Vivillon"), + [SPECIES_VIVILLON_SAVANNA] = _("Vivillon"), + [SPECIES_VIVILLON_SUN] = _("Vivillon"), + [SPECIES_VIVILLON_OCEAN] = _("Vivillon"), + [SPECIES_VIVILLON_JUNGLE] = _("Vivillon"), + [SPECIES_VIVILLON_FANCY] = _("Vivillon"), + [SPECIES_VIVILLON_POKE_BALL] = _("Vivillon"), [SPECIES_LITLEO] = _("Litleo"), [SPECIES_PYROAR] = _("Pyroar"), - [SPECIES_FLABEBE] = _("Flabébé"), - [SPECIES_FLOETTE] = _("Floette"), - [SPECIES_FLORGES] = _("Florges"), + [SPECIES_FLABEBE_RED_FLOWER] = _("Flabébé"), + [SPECIES_FLABEBE_YELLOW_FLOWER] = _("Flabébé"), + [SPECIES_FLABEBE_ORANGE_FLOWER] = _("Flabébé"), + [SPECIES_FLABEBE_BLUE_FLOWER] = _("Flabébé"), + [SPECIES_FLABEBE_WHITE_FLOWER] = _("Flabébé"), + [SPECIES_FLOETTE_RED_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_YELLOW_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_ORANGE_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_BLUE_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_WHITE_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_ETERNAL_FLOWER] = _("Floette"), + [SPECIES_FLORGES_RED_FLOWER] = _("Florges"), + [SPECIES_FLORGES_YELLOW_FLOWER] = _("Florges"), + [SPECIES_FLORGES_ORANGE_FLOWER] = _("Florges"), + [SPECIES_FLORGES_BLUE_FLOWER] = _("Florges"), + [SPECIES_FLORGES_WHITE_FLOWER] = _("Florges"), [SPECIES_SKIDDO] = _("Skiddo"), [SPECIES_GOGOAT] = _("Gogoat"), [SPECIES_PANCHAM] = _("Pancham"), [SPECIES_PANGORO] = _("Pangoro"), - [SPECIES_FURFROU] = _("Furfrou"), + [SPECIES_FURFROU_NATURAL] = _("Furfrou"), + [SPECIES_FURFROU_HEART_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_STAR_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_DIAMOND_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_DEBUTANTE_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_MATRON_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_DANDY_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_LA_REINE_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_KABUKI_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_PHARAOH_TRIM] = _("Furfrou"), [SPECIES_ESPURR] = _("Espurr"), - [SPECIES_MEOWSTIC] = _("Meowstic"), + [SPECIES_MEOWSTIC_MALE] = _("Meowstic"), + [SPECIES_MEOWSTIC_FEMALE] = _("Meowstic"), [SPECIES_HONEDGE] = _("Honedge"), [SPECIES_DOUBLADE] = _("Doublade"), - [SPECIES_AEGISLASH] = _("Aegislash"), + [SPECIES_AEGISLASH_SHIELD] = _("Aegislash"), + [SPECIES_AEGISLASH_BLADE] = _("Aegislash"), [SPECIES_SPRITZEE] = _("Spritzee"), [SPECIES_AROMATISSE] = _("Aromatisse"), [SPECIES_SWIRLIX] = _("Swirlix"), @@ -802,27 +959,44 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CARBINK] = _("Carbink"), [SPECIES_GOOMY] = _("Goomy"), [SPECIES_SLIGGOO] = _("Sliggoo"), + [SPECIES_SLIGGOO_HISUIAN] = _("Sliggoo"), [SPECIES_GOODRA] = _("Goodra"), + [SPECIES_GOODRA_HISUIAN] = _("Goodra"), [SPECIES_KLEFKI] = _("Klefki"), [SPECIES_PHANTUMP] = _("Phantump"), [SPECIES_TREVENANT] = _("Trevenant"), - [SPECIES_PUMPKABOO] = _("Pumpkaboo"), - [SPECIES_GOURGEIST] = _("Gourgeist"), + [SPECIES_PUMPKABOO_AVERAGE] = _("Pumpkaboo"), + [SPECIES_PUMPKABOO_SMALL] = _("Pumpkaboo"), + [SPECIES_PUMPKABOO_LARGE] = _("Pumpkaboo"), + [SPECIES_PUMPKABOO_SUPER] = _("Pumpkaboo"), + [SPECIES_GOURGEIST_AVERAGE] = _("Gourgeist"), + [SPECIES_GOURGEIST_SMALL] = _("Gourgeist"), + [SPECIES_GOURGEIST_LARGE] = _("Gourgeist"), + [SPECIES_GOURGEIST_SUPER] = _("Gourgeist"), [SPECIES_BERGMITE] = _("Bergmite"), [SPECIES_AVALUGG] = _("Avalugg"), + [SPECIES_AVALUGG_HISUIAN] = _("Avalugg"), [SPECIES_NOIBAT] = _("Noibat"), [SPECIES_NOIVERN] = _("Noivern"), - [SPECIES_XERNEAS] = _("Xerneas"), + [SPECIES_XERNEAS_NEUTRAL] = _("Xerneas"), + [SPECIES_XERNEAS_ACTIVE] = _("Xerneas"), [SPECIES_YVELTAL] = _("Yveltal"), - [SPECIES_ZYGARDE] = _("Zygarde"), + [SPECIES_ZYGARDE_50] = _("Zygarde"), + [SPECIES_ZYGARDE_10] = _("Zygarde"), + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = _("Zygarde"), + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = _("Zygarde"), + [SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"), [SPECIES_DIANCIE] = _("Diancie"), - [SPECIES_HOOPA] = _("Hoopa"), + [SPECIES_DIANCIE_MEGA] = _("Diancie"), + [SPECIES_HOOPA_CONFINED] = _("Hoopa"), + [SPECIES_HOOPA_UNBOUND] = _("Hoopa"), [SPECIES_VOLCANION] = _("Volcanion"), #endif #if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = _("Rowlet"), [SPECIES_DARTRIX] = _("Dartrix"), [SPECIES_DECIDUEYE] = _("Decidueye"), + [SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"), [SPECIES_LITTEN] = _("Litten"), [SPECIES_TORRACAT] = _("Torracat"), [SPECIES_INCINEROAR] = _("Incineroar"), @@ -839,12 +1013,19 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_VIKAVOLT] = _("Vikavolt"), [SPECIES_CRABRAWLER] = _("Crabrawler"), [SPECIES_CRABOMINABLE] = _("Crabminabl"), - [SPECIES_ORICORIO] = _("Oricorio"), + [SPECIES_ORICORIO_BAILE] = _("Oricorio"), + [SPECIES_ORICORIO_POM_POM] = _("Oricorio"), + [SPECIES_ORICORIO_PAU] = _("Oricorio"), + [SPECIES_ORICORIO_SENSU] = _("Oricorio"), [SPECIES_CUTIEFLY] = _("Cutiefly"), [SPECIES_RIBOMBEE] = _("Ribombee"), [SPECIES_ROCKRUFF] = _("Rockruff"), - [SPECIES_LYCANROC] = _("Lycanroc"), - [SPECIES_WISHIWASHI] = _("Wishiwashi"), + [SPECIES_ROCKRUFF_OWN_TEMPO] = _("Rockruff"), + [SPECIES_LYCANROC_MIDDAY] = _("Lycanroc"), + [SPECIES_LYCANROC_MIDNIGHT] = _("Lycanroc"), + [SPECIES_LYCANROC_DUSK] = _("Lycanroc"), + [SPECIES_WISHIWASHI_SOLO] = _("Wishiwashi"), + [SPECIES_WISHIWASHI_SCHOOL] = _("Wishiwashi"), [SPECIES_MAREANIE] = _("Mareanie"), [SPECIES_TOXAPEX] = _("Toxapex"), [SPECIES_MUDBRAY] = _("Mudbray"), @@ -871,12 +1052,43 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_PALOSSAND] = _("Palossand"), [SPECIES_PYUKUMUKU] = _("Pyukumuku"), [SPECIES_TYPE_NULL] = _("Type: Null"), - [SPECIES_SILVALLY] = _("Silvally"), - [SPECIES_MINIOR] = _("Minior"), + [SPECIES_SILVALLY_NORMAL] = _("Silvally"), + [SPECIES_SILVALLY_FIGHTING] = _("Silvally"), + [SPECIES_SILVALLY_FLYING] = _("Silvally"), + [SPECIES_SILVALLY_POISON] = _("Silvally"), + [SPECIES_SILVALLY_GROUND] = _("Silvally"), + [SPECIES_SILVALLY_ROCK] = _("Silvally"), + [SPECIES_SILVALLY_BUG] = _("Silvally"), + [SPECIES_SILVALLY_GHOST] = _("Silvally"), + [SPECIES_SILVALLY_STEEL] = _("Silvally"), + [SPECIES_SILVALLY_FIRE] = _("Silvally"), + [SPECIES_SILVALLY_WATER] = _("Silvally"), + [SPECIES_SILVALLY_GRASS] = _("Silvally"), + [SPECIES_SILVALLY_ELECTRIC] = _("Silvally"), + [SPECIES_SILVALLY_PSYCHIC] = _("Silvally"), + [SPECIES_SILVALLY_ICE] = _("Silvally"), + [SPECIES_SILVALLY_DRAGON] = _("Silvally"), + [SPECIES_SILVALLY_DARK] = _("Silvally"), + [SPECIES_SILVALLY_FAIRY] = _("Silvally"), + [SPECIES_MINIOR_METEOR_RED] = _("Minior"), + [SPECIES_MINIOR_METEOR_ORANGE] = _("Minior"), + [SPECIES_MINIOR_METEOR_YELLOW] = _("Minior"), + [SPECIES_MINIOR_METEOR_GREEN] = _("Minior"), + [SPECIES_MINIOR_METEOR_BLUE] = _("Minior"), + [SPECIES_MINIOR_METEOR_INDIGO] = _("Minior"), + [SPECIES_MINIOR_METEOR_VIOLET] = _("Minior"), + [SPECIES_MINIOR_CORE_RED] = _("Minior"), + [SPECIES_MINIOR_CORE_ORANGE] = _("Minior"), + [SPECIES_MINIOR_CORE_YELLOW] = _("Minior"), + [SPECIES_MINIOR_CORE_GREEN] = _("Minior"), + [SPECIES_MINIOR_CORE_BLUE] = _("Minior"), + [SPECIES_MINIOR_CORE_INDIGO] = _("Minior"), + [SPECIES_MINIOR_CORE_VIOLET] = _("Minior"), [SPECIES_KOMALA] = _("Komala"), [SPECIES_TURTONATOR] = _("Turtonator"), [SPECIES_TOGEDEMARU] = _("Togedemaru"), - [SPECIES_MIMIKYU] = _("Mimikyu"), + [SPECIES_MIMIKYU_DISGUISED] = _("Mimikyu"), + [SPECIES_MIMIKYU_BUSTED] = _("Mimikyu"), [SPECIES_BRUXISH] = _("Bruxish"), [SPECIES_DRAMPA] = _("Drampa"), [SPECIES_DHELMISE] = _("Dhelmise"), @@ -899,7 +1111,11 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_KARTANA] = _("Kartana"), [SPECIES_GUZZLORD] = _("Guzzlord"), [SPECIES_NECROZMA] = _("Necrozma"), + [SPECIES_NECROZMA_DUSK_MANE] = _("Necrozma"), + [SPECIES_NECROZMA_DAWN_WINGS] = _("Necrozma"), + [SPECIES_NECROZMA_ULTRA] = _("Necrozma"), [SPECIES_MAGEARNA] = _("Magearna"), + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = _("Magearna"), [SPECIES_MARSHADOW] = _("Marshadow"), [SPECIES_POIPOLE] = _("Poipole"), [SPECIES_NAGANADEL] = _("Naganadel"), @@ -946,16 +1162,21 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SILICOBRA] = _("Silicobra"), [SPECIES_SANDACONDA] = _("Sandaconda"), [SPECIES_CRAMORANT] = _("Cramorant"), + [SPECIES_CRAMORANT_GULPING] = _("Cramorant"), + [SPECIES_CRAMORANT_GORGING] = _("Cramorant"), [SPECIES_ARROKUDA] = _("Arrokuda"), [SPECIES_BARRASKEWDA] = _("Barraskewd"), [SPECIES_TOXEL] = _("Toxel"), - [SPECIES_TOXTRICITY] = _("Toxtricity"), + [SPECIES_TOXTRICITY_AMPED] = _("Toxtricity"), + [SPECIES_TOXTRICITY_LOW_KEY] = _("Toxtricity"), [SPECIES_SIZZLIPEDE] = _("Sizzlipede"), [SPECIES_CENTISKORCH] = _("Centiskorc"), [SPECIES_CLOBBOPUS] = _("Clobbopus"), [SPECIES_GRAPPLOCT] = _("Grapploct"), - [SPECIES_SINISTEA] = _("Sinistea"), - [SPECIES_POLTEAGEIST] = _("Polteageis"), + [SPECIES_SINISTEA_PHONY] = _("Sinistea"), + [SPECIES_SINISTEA_ANTIQUE] = _("Sinistea"), + [SPECIES_POLTEAGEIST_PHONY] = _("Polteageis"), + [SPECIES_POLTEAGEIST_ANTIQUE] = _("Polteageis"), [SPECIES_HATENNA] = _("Hatenna"), [SPECIES_HATTREM] = _("Hattrem"), [SPECIES_HATTERENE] = _("Hatterene"), @@ -969,15 +1190,26 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MR_RIME] = _("Mr. Rime"), [SPECIES_RUNERIGUS] = _("Runerigus"), [SPECIES_MILCERY] = _("Milcery"), - [SPECIES_ALCREMIE] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = _("Alcremie"), [SPECIES_FALINKS] = _("Falinks"), [SPECIES_PINCURCHIN] = _("Pincurchin"), [SPECIES_SNOM] = _("Snom"), [SPECIES_FROSMOTH] = _("Frosmoth"), [SPECIES_STONJOURNER] = _("Stonjourne"), - [SPECIES_EISCUE] = _("Eiscue"), - [SPECIES_INDEEDEE] = _("Indeedee"), - [SPECIES_MORPEKO] = _("Morpeko"), + [SPECIES_EISCUE_ICE_FACE] = _("Eiscue"), + [SPECIES_EISCUE_NOICE_FACE] = _("Eiscue"), + [SPECIES_INDEEDEE_MALE] = _("Indeedee"), + [SPECIES_INDEEDEE_FEMALE] = _("Indeedee"), + [SPECIES_MORPEKO_FULL_BELLY] = _("Morpeko"), + [SPECIES_MORPEKO_HANGRY] = _("Morpeko"), [SPECIES_CUFANT] = _("Cufant"), [SPECIES_COPPERAJAH] = _("Copperajah"), [SPECIES_DRACOZOLT] = _("Dracozolt"), @@ -988,344 +1220,30 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DREEPY] = _("Dreepy"), [SPECIES_DRAKLOAK] = _("Drakloak"), [SPECIES_DRAGAPULT] = _("Dragapult"), - [SPECIES_ZACIAN] = _("Zacian"), - [SPECIES_ZAMAZENTA] = _("Zamazenta"), + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = _("Zacian"), + [SPECIES_ZACIAN_CROWNED_SWORD] = _("Zacian"), + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = _("Zamazenta"), + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = _("Zamazenta"), [SPECIES_ETERNATUS] = _("Eternatus"), + [SPECIES_ETERNATUS_ETERNAMAX] = _("Eternatus"), [SPECIES_KUBFU] = _("Kubfu"), - [SPECIES_URSHIFU] = _("Urshifu"), + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = _("Urshifu"), + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = _("Urshifu"), [SPECIES_ZARUDE] = _("Zarude"), + [SPECIES_ZARUDE_DADA] = _("Zarude"), [SPECIES_REGIELEKI] = _("Regieleki"), [SPECIES_REGIDRAGO] = _("Regidrago"), [SPECIES_GLASTRIER] = _("Glastrier"), [SPECIES_SPECTRIER] = _("Spectrier"), [SPECIES_CALYREX] = _("Calyrex"), + [SPECIES_CALYREX_ICE_RIDER] = _("Calyrex"), + [SPECIES_CALYREX_SHADOW_RIDER] = _("Calyrex"), [SPECIES_WYRDEER] = _("Wyrdeer"), [SPECIES_KLEAVOR] = _("Kleavor"), [SPECIES_URSALUNA] = _("Ursaluna"), [SPECIES_BASCULEGION] = _("Bsculegion"), [SPECIES_SNEASLER] = _("Sneasler"), [SPECIES_OVERQWIL] = _("Overqwil"), - [SPECIES_ENAMORUS] = _("Enamorus"), -#endif - - // Megas - [SPECIES_VENUSAUR_MEGA] = _("Venusaur"), - [SPECIES_CHARIZARD_MEGA_X] = _("Charizard"), - [SPECIES_CHARIZARD_MEGA_Y] = _("Charizard"), - [SPECIES_BLASTOISE_MEGA] = _("Blastoise"), - [SPECIES_BEEDRILL_MEGA] = _("Beedrill"), - [SPECIES_PIDGEOT_MEGA] = _("Pidgeot"), - [SPECIES_ALAKAZAM_MEGA] = _("Alakazam"), - [SPECIES_SLOWBRO_MEGA] = _("Slowbro"), - [SPECIES_GENGAR_MEGA] = _("Gengar"), - [SPECIES_KANGASKHAN_MEGA] = _("Kangaskhan"), - [SPECIES_PINSIR_MEGA] = _("Pinsir"), - [SPECIES_GYARADOS_MEGA] = _("Gyarados"), - [SPECIES_AERODACTYL_MEGA] = _("Aerodactyl"), - [SPECIES_MEWTWO_MEGA_X] = _("Mewtwo"), - [SPECIES_MEWTWO_MEGA_Y] = _("Mewtwo"), - [SPECIES_AMPHAROS_MEGA] = _("Ampharos"), - [SPECIES_STEELIX_MEGA] = _("Steelix"), - [SPECIES_SCIZOR_MEGA] = _("Scizor"), - [SPECIES_HERACROSS_MEGA] = _("Heracross"), - [SPECIES_HOUNDOOM_MEGA] = _("Houndoom"), - [SPECIES_TYRANITAR_MEGA] = _("Tyranitar"), - [SPECIES_SCEPTILE_MEGA] = _("Sceptile"), - [SPECIES_BLAZIKEN_MEGA] = _("Blaziken"), - [SPECIES_SWAMPERT_MEGA] = _("Swampert"), - [SPECIES_GARDEVOIR_MEGA] = _("Gardevoir"), - [SPECIES_SABLEYE_MEGA] = _("Sableye"), - [SPECIES_MAWILE_MEGA] = _("Mawile"), - [SPECIES_AGGRON_MEGA] = _("Aggron"), - [SPECIES_MEDICHAM_MEGA] = _("Medicham"), - [SPECIES_MANECTRIC_MEGA] = _("Manectric"), - [SPECIES_SHARPEDO_MEGA] = _("Sharpedo"), - [SPECIES_CAMERUPT_MEGA] = _("Camerupt"), - [SPECIES_ALTARIA_MEGA] = _("Altaria"), - [SPECIES_BANETTE_MEGA] = _("Banette"), - [SPECIES_ABSOL_MEGA] = _("Absol"), - [SPECIES_GLALIE_MEGA] = _("Glalie"), - [SPECIES_SALAMENCE_MEGA] = _("Salamence"), - [SPECIES_METAGROSS_MEGA] = _("Metagross"), - [SPECIES_LATIAS_MEGA] = _("Latias"), - [SPECIES_LATIOS_MEGA] = _("Latios"), -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA] = _("Lopunny"), - [SPECIES_GARCHOMP_MEGA] = _("Garchomp"), - [SPECIES_LUCARIO_MEGA] = _("Lucario"), - [SPECIES_ABOMASNOW_MEGA] = _("Abomasnow"), - [SPECIES_GALLADE_MEGA] = _("Gallade"), -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA] = _("Audino"), -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA] = _("Diancie"), -#endif - // Special Mega + Primals - [SPECIES_RAYQUAZA_MEGA] = _("Rayquaza"), - [SPECIES_KYOGRE_PRIMAL] = _("Kyogre"), - [SPECIES_GROUDON_PRIMAL] = _("Groudon"), - - // Alolan Forms - [SPECIES_RATTATA_ALOLAN] = _("Rattata"), - [SPECIES_RATICATE_ALOLAN] = _("Raticate"), - [SPECIES_RAICHU_ALOLAN] = _("Raichu"), - [SPECIES_SANDSHREW_ALOLAN] = _("Sandshrew"), - [SPECIES_SANDSLASH_ALOLAN] = _("Sandslash"), - [SPECIES_VULPIX_ALOLAN] = _("Vulpix"), - [SPECIES_NINETALES_ALOLAN] = _("Ninetales"), - [SPECIES_DIGLETT_ALOLAN] = _("Diglett"), - [SPECIES_DUGTRIO_ALOLAN] = _("Dugtrio"), - [SPECIES_MEOWTH_ALOLAN] = _("Meowth"), - [SPECIES_PERSIAN_ALOLAN] = _("Persian"), - [SPECIES_GEODUDE_ALOLAN] = _("Geodude"), - [SPECIES_GRAVELER_ALOLAN] = _("Graveler"), - [SPECIES_GOLEM_ALOLAN] = _("Golem"), - [SPECIES_GRIMER_ALOLAN] = _("Grimer"), - [SPECIES_MUK_ALOLAN] = _("Muk"), - [SPECIES_EXEGGUTOR_ALOLAN] = _("Exeggutor"), - [SPECIES_MAROWAK_ALOLAN] = _("Marowak"), - - // Galarian Forms - [SPECIES_MEOWTH_GALARIAN] = _("Meowth"), - [SPECIES_PONYTA_GALARIAN] = _("Ponyta"), - [SPECIES_RAPIDASH_GALARIAN] = _("Rapidash"), - [SPECIES_SLOWPOKE_GALARIAN] = _("Slowpoke"), - [SPECIES_SLOWBRO_GALARIAN] = _("Slowbro"), - [SPECIES_FARFETCHD_GALARIAN] = _("Farfetch'd"), - [SPECIES_WEEZING_GALARIAN] = _("Weezing"), - [SPECIES_MR_MIME_GALARIAN] = _("Mr. Mime"), - [SPECIES_ARTICUNO_GALARIAN] = _("Articuno"), - [SPECIES_ZAPDOS_GALARIAN] = _("Zapdos"), - [SPECIES_MOLTRES_GALARIAN] = _("Moltres"), - [SPECIES_SLOWKING_GALARIAN] = _("Slowking"), - [SPECIES_CORSOLA_GALARIAN] = _("Corsola"), - [SPECIES_ZIGZAGOON_GALARIAN] = _("Zigzagoon"), - [SPECIES_LINOONE_GALARIAN] = _("Linoone"), -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN] = _("Darumaka"), - [SPECIES_DARMANITAN_GALARIAN] = _("Darmanitan"), - [SPECIES_YAMASK_GALARIAN] = _("Yamask"), - [SPECIES_STUNFISK_GALARIAN] = _("Stunfisk"), -#endif - -//Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN] = _("Growlithe"), - [SPECIES_ARCANINE_HISUIAN] = _("Arcanine"), - [SPECIES_VOLTORB_HISUIAN] = _("Voltorb"), - [SPECIES_ELECTRODE_HISUIAN] = _("Electrode"), - [SPECIES_TYPHLOSION_HISUIAN] = _("Typhlosion"), - [SPECIES_QWILFISH_HISUIAN] = _("Qwilfish"), - [SPECIES_SNEASEL_HISUIAN] = _("Sneasel"), -#if P_GEN_5_POKEMON == TRUE - [SPECIES_SAMUROTT_HISUIAN] = _("Samurott"), - [SPECIES_LILLIGANT_HISUIAN] = _("Lilligant"), - [SPECIES_ZORUA_HISUIAN] = _("Zorua"), - [SPECIES_ZOROARK_HISUIAN] = _("Zoroark"), - [SPECIES_BRAVIARY_HISUIAN] = _("Braviary"), -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = _("Sliggoo"), - [SPECIES_GOODRA_HISUIAN] = _("Goodra"), - [SPECIES_AVALUGG_HISUIAN] = _("Avalugg"), -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"), -#endif - - // Cosplay Pikachu - [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), - [SPECIES_PIKACHU_ROCK_STAR] = _("Pikachu"), - [SPECIES_PIKACHU_BELLE] = _("Pikachu"), - [SPECIES_PIKACHU_POP_STAR] = _("Pikachu"), - [SPECIES_PIKACHU_PH_D] = _("Pikachu"), - [SPECIES_PIKACHU_LIBRE] = _("Pikachu"), - // Cap Pikachu - [SPECIES_PIKACHU_ORIGINAL_CAP] = _("Pikachu"), - [SPECIES_PIKACHU_HOENN_CAP] = _("Pikachu"), - [SPECIES_PIKACHU_SINNOH_CAP] = _("Pikachu"), - [SPECIES_PIKACHU_UNOVA_CAP] = _("Pikachu"), - [SPECIES_PIKACHU_KALOS_CAP] = _("Pikachu"), - [SPECIES_PIKACHU_ALOLA_CAP] = _("Pikachu"), - [SPECIES_PIKACHU_PARTNER_CAP] = _("Pikachu"), - [SPECIES_PIKACHU_WORLD_CAP] = _("Pikachu"), - // Pichu -#if P_GEN_4_POKEMON == TRUE - // Origin Forme - [SPECIES_DIALGA_ORIGIN] = _("Dialga"), - [SPECIES_PALKIA_ORIGIN] = _("Palkia"), - // Arceus - [SPECIES_ARCEUS_FAIRY] = _("Arceus"), -#endif -#if P_GEN_5_POKEMON == TRUE - - [SPECIES_BASCULIN_WHITE_STRIPED] = _("Basculin"), - // Darmanitan - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = _("Darmanitan"), -#endif -#if P_GEN_6_POKEMON == TRUE - // Greninja - [SPECIES_GRENINJA_BATTLE_BOND] = _("Greninja"), - [SPECIES_GRENINJA_ASH] = _("Greninja"), - // Vivillon - [SPECIES_VIVILLON_POLAR] = _("Vivillon"), - [SPECIES_VIVILLON_TUNDRA] = _("Vivillon"), - [SPECIES_VIVILLON_CONTINENTAL] = _("Vivillon"), - [SPECIES_VIVILLON_GARDEN] = _("Vivillon"), - [SPECIES_VIVILLON_ELEGANT] = _("Vivillon"), - [SPECIES_VIVILLON_MEADOW] = _("Vivillon"), - [SPECIES_VIVILLON_MODERN] = _("Vivillon"), - [SPECIES_VIVILLON_MARINE] = _("Vivillon"), - [SPECIES_VIVILLON_ARCHIPELAGO] = _("Vivillon"), - [SPECIES_VIVILLON_HIGH_PLAINS] = _("Vivillon"), - [SPECIES_VIVILLON_SANDSTORM] = _("Vivillon"), - [SPECIES_VIVILLON_RIVER] = _("Vivillon"), - [SPECIES_VIVILLON_MONSOON] = _("Vivillon"), - [SPECIES_VIVILLON_SAVANNA] = _("Vivillon"), - [SPECIES_VIVILLON_SUN] = _("Vivillon"), - [SPECIES_VIVILLON_OCEAN] = _("Vivillon"), - [SPECIES_VIVILLON_JUNGLE] = _("Vivillon"), - [SPECIES_VIVILLON_FANCY] = _("Vivillon"), - [SPECIES_VIVILLON_POKE_BALL] = _("Vivillon"), - // Flabébé - [SPECIES_FLABEBE_YELLOW_FLOWER] = _("Flabébé"), - [SPECIES_FLABEBE_ORANGE_FLOWER] = _("Flabébé"), - [SPECIES_FLABEBE_BLUE_FLOWER] = _("Flabébé"), - [SPECIES_FLABEBE_WHITE_FLOWER] = _("Flabébé"), - // Floette - [SPECIES_FLOETTE_YELLOW_FLOWER] = _("Floette"), - [SPECIES_FLOETTE_ORANGE_FLOWER] = _("Floette"), - [SPECIES_FLOETTE_BLUE_FLOWER] = _("Floette"), - [SPECIES_FLOETTE_WHITE_FLOWER] = _("Floette"), - [SPECIES_FLOETTE_ETERNAL_FLOWER] = _("Floette"), - // Florges - [SPECIES_FLORGES_YELLOW_FLOWER] = _("Florges"), - [SPECIES_FLORGES_ORANGE_FLOWER] = _("Florges"), - [SPECIES_FLORGES_BLUE_FLOWER] = _("Florges"), - [SPECIES_FLORGES_WHITE_FLOWER] = _("Florges"), - // Furfrou - [SPECIES_FURFROU_HEART_TRIM] = _("Furfrou"), - [SPECIES_FURFROU_STAR_TRIM] = _("Furfrou"), - [SPECIES_FURFROU_DIAMOND_TRIM] = _("Furfrou"), - [SPECIES_FURFROU_DEBUTANTE_TRIM] = _("Furfrou"), - [SPECIES_FURFROU_MATRON_TRIM] = _("Furfrou"), - [SPECIES_FURFROU_DANDY_TRIM] = _("Furfrou"), - [SPECIES_FURFROU_LA_REINE_TRIM] = _("Furfrou"), - [SPECIES_FURFROU_KABUKI_TRIM] = _("Furfrou"), - [SPECIES_FURFROU_PHARAOH_TRIM] = _("Furfrou"), - // Meowstic - [SPECIES_MEOWSTIC_FEMALE] = _("Meowstic"), - // Aegislash - [SPECIES_AEGISLASH_BLADE] = _("Aegislash"), - // Pumpkaboo - [SPECIES_PUMPKABOO_SMALL] = _("Pumpkaboo"), - [SPECIES_PUMPKABOO_LARGE] = _("Pumpkaboo"), - [SPECIES_PUMPKABOO_SUPER] = _("Pumpkaboo"), - // Gourgeist - [SPECIES_GOURGEIST_SMALL] = _("Gourgeist"), - [SPECIES_GOURGEIST_LARGE] = _("Gourgeist"), - [SPECIES_GOURGEIST_SUPER] = _("Gourgeist"), - // Xerneas - [SPECIES_XERNEAS_ACTIVE] = _("Xerneas"), - // Zygarde - [SPECIES_ZYGARDE_10] = _("Zygarde"), - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = _("Zygarde"), - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = _("Zygarde"), - [SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"), - // Hoopa - [SPECIES_HOOPA_UNBOUND] = _("Hoopa"), -#endif -#if P_GEN_7_POKEMON == TRUE - // Oricorio - [SPECIES_ORICORIO_POM_POM] = _("Oricorio"), - [SPECIES_ORICORIO_PAU] = _("Oricorio"), - [SPECIES_ORICORIO_SENSU] = _("Oricorio"), - // Rockruff - [SPECIES_ROCKRUFF_OWN_TEMPO] = _("Rockruff"), - // Lycanroc - [SPECIES_LYCANROC_MIDNIGHT] = _("Lycanroc"), - [SPECIES_LYCANROC_DUSK] = _("Lycanroc"), - // Wishiwashi - [SPECIES_WISHIWASHI_SCHOOL] = _("Wishiwashi"), - // Silvally - [SPECIES_SILVALLY_FIGHTING] = _("Silvally"), - [SPECIES_SILVALLY_FLYING] = _("Silvally"), - [SPECIES_SILVALLY_POISON] = _("Silvally"), - [SPECIES_SILVALLY_GROUND] = _("Silvally"), - [SPECIES_SILVALLY_ROCK] = _("Silvally"), - [SPECIES_SILVALLY_BUG] = _("Silvally"), - [SPECIES_SILVALLY_GHOST] = _("Silvally"), - [SPECIES_SILVALLY_STEEL] = _("Silvally"), - [SPECIES_SILVALLY_FIRE] = _("Silvally"), - [SPECIES_SILVALLY_WATER] = _("Silvally"), - [SPECIES_SILVALLY_GRASS] = _("Silvally"), - [SPECIES_SILVALLY_ELECTRIC] = _("Silvally"), - [SPECIES_SILVALLY_PSYCHIC] = _("Silvally"), - [SPECIES_SILVALLY_ICE] = _("Silvally"), - [SPECIES_SILVALLY_DRAGON] = _("Silvally"), - [SPECIES_SILVALLY_DARK] = _("Silvally"), - [SPECIES_SILVALLY_FAIRY] = _("Silvally"), - // Minior - [SPECIES_MINIOR_METEOR_ORANGE] = _("Minior"), - [SPECIES_MINIOR_METEOR_YELLOW] = _("Minior"), - [SPECIES_MINIOR_METEOR_GREEN] = _("Minior"), - [SPECIES_MINIOR_METEOR_BLUE] = _("Minior"), - [SPECIES_MINIOR_METEOR_INDIGO] = _("Minior"), - [SPECIES_MINIOR_METEOR_VIOLET] = _("Minior"), - [SPECIES_MINIOR_CORE_RED] = _("Minior"), - [SPECIES_MINIOR_CORE_ORANGE] = _("Minior"), - [SPECIES_MINIOR_CORE_YELLOW] = _("Minior"), - [SPECIES_MINIOR_CORE_GREEN] = _("Minior"), - [SPECIES_MINIOR_CORE_BLUE] = _("Minior"), - [SPECIES_MINIOR_CORE_INDIGO] = _("Minior"), - [SPECIES_MINIOR_CORE_VIOLET] = _("Minior"), - // Mimikyu - [SPECIES_MIMIKYU_BUSTED] = _("Mimikyu"), - // Necrozma - [SPECIES_NECROZMA_DUSK_MANE] = _("Necrozma"), - [SPECIES_NECROZMA_DAWN_WINGS] = _("Necrozma"), - [SPECIES_NECROZMA_ULTRA] = _("Necrozma"), - // Magearna - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = _("Magearna"), -#endif -#if P_GEN_8_POKEMON == TRUE - // Cramorant - [SPECIES_CRAMORANT_GULPING] = _("Cramorant"), - [SPECIES_CRAMORANT_GORGING] = _("Cramorant"), - // Toxtricity - [SPECIES_TOXTRICITY_LOW_KEY] = _("Toxtricity"), - // Sinistea - [SPECIES_SINISTEA_ANTIQUE] = _("Sinistea"), - // Polteageist - [SPECIES_POLTEAGEIST_ANTIQUE] = _("Polteageis"), - // Alcremie - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = _("Alcremie"), - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = _("Alcremie"), - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = _("Alcremie"), - // Eiscue - [SPECIES_EISCUE_NOICE_FACE] = _("Eiscue"), - // Indeedee - [SPECIES_INDEEDEE_FEMALE] = _("Indeedee"), - // Morpeko - [SPECIES_MORPEKO_HANGRY] = _("Morpeko"), - // Zacian - [SPECIES_ZACIAN_CROWNED_SWORD] = _("Zacian"), - // Zamazenta - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = _("Zamazenta"), - // Eternatus - [SPECIES_ETERNATUS_ETERNAMAX] = _("Eternatus"), - // Urshifu - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = _("Urshifu"), - // Zarude - [SPECIES_ZARUDE_DADA] = _("Zarude"), - // Calyrex - [SPECIES_CALYREX_ICE_RIDER] = _("Calyrex"), - [SPECIES_CALYREX_SHADOW_RIDER] = _("Calyrex"), + [SPECIES_ENAMORUS_INCARNATE] = _("Enamorus"), #endif }; diff --git a/src/daycare.c b/src/daycare.c index 18bc45eb01..6114e561bc 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -752,34 +752,20 @@ static void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare *species = SPECIES_WOBBUFFET; else if (*species == SPECIES_AZURILL && motherItem != ITEM_SEA_INCENSE && fatherItem != ITEM_SEA_INCENSE) *species = SPECIES_MARILL; - #ifdef SPECIES_MUNCHLAX - else if (*species == SPECIES_MUNCHLAX && motherItem != ITEM_FULL_INCENSE && fatherItem != ITEM_FULL_INCENSE) - *species = SPECIES_SNORLAX; - #endif - #ifdef SPECIES_HAPPINY - else if (*species == SPECIES_HAPPINY && motherItem != ITEM_LUCK_INCENSE && fatherItem != ITEM_LUCK_INCENSE) - *species = SPECIES_CHANSEY; - #endif - #ifdef SPECIES_MIME_JR - else if (*species == SPECIES_MIME_JR && motherItem != ITEM_ODD_INCENSE && fatherItem != ITEM_ODD_INCENSE) - *species = SPECIES_MR_MIME; - #endif - #ifdef SPECIES_CHINGLING - else if (*species == SPECIES_CHINGLING && motherItem != ITEM_PURE_INCENSE && fatherItem != ITEM_PURE_INCENSE) - *species = SPECIES_CHIMECHO; - #endif - #ifdef SPECIES_BONSLY - else if (*species == SPECIES_BONSLY && motherItem != ITEM_ROCK_INCENSE && fatherItem != ITEM_ROCK_INCENSE) - *species = SPECIES_SUDOWOODO; - #endif - #ifdef SPECIES_BUDEW - else if (*species == SPECIES_BUDEW && motherItem != ITEM_ROSE_INCENSE && fatherItem != ITEM_ROSE_INCENSE) - *species = SPECIES_ROSELIA; - #endif - #ifdef SPECIES_MANTYKE - else if (*species == SPECIES_MANTYKE && motherItem != ITEM_WAVE_INCENSE && fatherItem != ITEM_WAVE_INCENSE) - *species = SPECIES_MANTINE; - #endif + else if (*species == SPECIES_MUNCHLAX && motherItem != ITEM_FULL_INCENSE && fatherItem != ITEM_FULL_INCENSE) + *species = SPECIES_SNORLAX; + else if (*species == SPECIES_HAPPINY && motherItem != ITEM_LUCK_INCENSE && fatherItem != ITEM_LUCK_INCENSE) + *species = SPECIES_CHANSEY; + else if (*species == SPECIES_MIME_JR && motherItem != ITEM_ODD_INCENSE && fatherItem != ITEM_ODD_INCENSE) + *species = SPECIES_MR_MIME; + else if (*species == SPECIES_CHINGLING && motherItem != ITEM_PURE_INCENSE && fatherItem != ITEM_PURE_INCENSE) + *species = SPECIES_CHIMECHO; + else if (*species == SPECIES_BONSLY && motherItem != ITEM_ROCK_INCENSE && fatherItem != ITEM_ROCK_INCENSE) + *species = SPECIES_SUDOWOODO; + else if (*species == SPECIES_BUDEW && motherItem != ITEM_ROSE_INCENSE && fatherItem != ITEM_ROSE_INCENSE) + *species = SPECIES_ROSELIA; + else if (*species == SPECIES_MANTYKE && motherItem != ITEM_WAVE_INCENSE && fatherItem != ITEM_WAVE_INCENSE) + *species = SPECIES_MANTINE; } static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare) @@ -829,13 +815,15 @@ static u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parent else if (eggSpecies == SPECIES_MANAPHY) eggSpecies = SPECIES_PHIONE; else if (eggSpecies == SPECIES_SINISTEA_ANTIQUE) - eggSpecies = SPECIES_SINISTEA; + eggSpecies = SPECIES_SINISTEA_PHONY; else if (GET_BASE_SPECIES_ID(eggSpecies) == SPECIES_VIVILLON) eggSpecies = SPECIES_SCATTERBUG; else if (GET_BASE_SPECIES_ID(eggSpecies) == SPECIES_ROTOM) eggSpecies = SPECIES_ROTOM; else if (GET_BASE_SPECIES_ID(eggSpecies) == SPECIES_FURFROU) - eggSpecies = SPECIES_FURFROU; + eggSpecies = SPECIES_FURFROU_NATURAL; + else if (GET_BASE_SPECIES_ID(eggSpecies) == SPECIES_ALCREMIE) + eggSpecies = SPECIES_MILCERY; // Make Ditto the "mother" slot if the other daycare mon is male. if (species[parentSlots[1]] == SPECIES_DITTO && GetBoxMonGender(&daycare->mons[parentSlots[0]].mon) != MON_FEMALE) diff --git a/src/pokemon.c b/src/pokemon.c index d5a9b8405a..3d2a282660 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -99,7 +99,7 @@ static const struct CombinedMove sCombinedMoves[2] = // To reorder the pokedex, see the values in include/constants/pokedex.h. #define SPECIES_TO_HOENN(name) [SPECIES_##name - 1] = HOENN_DEX_##name -#define SPECIES_TO_NATIONAL(name) [SPECIES_##name - 1] = NATIONAL_DEX_##name +#define SPECIES_TO_NATIONAL(name, ...) [SPECIES_##name##__VA_ARGS__ - 1] = NATIONAL_DEX_##name #define HOENN_TO_NATIONAL(name) [HOENN_DEX_##name - 1] = NATIONAL_DEX_##name // Assigns all species to the Hoenn Dex Index (Summary No. for Hoenn Dex) @@ -342,31 +342,56 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(BULBASAUR), SPECIES_TO_NATIONAL(IVYSAUR), SPECIES_TO_NATIONAL(VENUSAUR), + SPECIES_TO_NATIONAL(VENUSAUR,_MEGA), SPECIES_TO_NATIONAL(CHARMANDER), SPECIES_TO_NATIONAL(CHARMELEON), SPECIES_TO_NATIONAL(CHARIZARD), + SPECIES_TO_NATIONAL(CHARIZARD,_MEGA_X), + SPECIES_TO_NATIONAL(CHARIZARD,_MEGA_Y), SPECIES_TO_NATIONAL(SQUIRTLE), SPECIES_TO_NATIONAL(WARTORTLE), SPECIES_TO_NATIONAL(BLASTOISE), + SPECIES_TO_NATIONAL(BLASTOISE,_MEGA), SPECIES_TO_NATIONAL(CATERPIE), SPECIES_TO_NATIONAL(METAPOD), SPECIES_TO_NATIONAL(BUTTERFREE), SPECIES_TO_NATIONAL(WEEDLE), SPECIES_TO_NATIONAL(KAKUNA), SPECIES_TO_NATIONAL(BEEDRILL), + SPECIES_TO_NATIONAL(BEEDRILL,_MEGA), SPECIES_TO_NATIONAL(PIDGEY), SPECIES_TO_NATIONAL(PIDGEOTTO), SPECIES_TO_NATIONAL(PIDGEOT), + SPECIES_TO_NATIONAL(PIDGEOT,_MEGA), SPECIES_TO_NATIONAL(RATTATA), + SPECIES_TO_NATIONAL(RATTATA,_ALOLAN), SPECIES_TO_NATIONAL(RATICATE), + SPECIES_TO_NATIONAL(RATICATE,_ALOLAN), SPECIES_TO_NATIONAL(SPEAROW), SPECIES_TO_NATIONAL(FEAROW), SPECIES_TO_NATIONAL(EKANS), SPECIES_TO_NATIONAL(ARBOK), SPECIES_TO_NATIONAL(PIKACHU), + SPECIES_TO_NATIONAL(PIKACHU,_COSPLAY), + SPECIES_TO_NATIONAL(PIKACHU,_ROCK_STAR), + SPECIES_TO_NATIONAL(PIKACHU,_BELLE), + SPECIES_TO_NATIONAL(PIKACHU,_POP_STAR), + SPECIES_TO_NATIONAL(PIKACHU,_PH_D), + SPECIES_TO_NATIONAL(PIKACHU,_LIBRE), + SPECIES_TO_NATIONAL(PIKACHU,_ORIGINAL_CAP), + SPECIES_TO_NATIONAL(PIKACHU,_HOENN_CAP), + SPECIES_TO_NATIONAL(PIKACHU,_SINNOH_CAP), + SPECIES_TO_NATIONAL(PIKACHU,_UNOVA_CAP), + SPECIES_TO_NATIONAL(PIKACHU,_KALOS_CAP), + SPECIES_TO_NATIONAL(PIKACHU,_ALOLA_CAP), + SPECIES_TO_NATIONAL(PIKACHU,_PARTNER_CAP), + SPECIES_TO_NATIONAL(PIKACHU,_WORLD_CAP), SPECIES_TO_NATIONAL(RAICHU), + SPECIES_TO_NATIONAL(RAICHU,_ALOLAN), SPECIES_TO_NATIONAL(SANDSHREW), + SPECIES_TO_NATIONAL(SANDSHREW,_ALOLAN), SPECIES_TO_NATIONAL(SANDSLASH), + SPECIES_TO_NATIONAL(SANDSLASH,_ALOLAN), SPECIES_TO_NATIONAL(NIDORAN_F), SPECIES_TO_NATIONAL(NIDORINA), SPECIES_TO_NATIONAL(NIDOQUEEN), @@ -376,7 +401,9 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(CLEFAIRY), SPECIES_TO_NATIONAL(CLEFABLE), SPECIES_TO_NATIONAL(VULPIX), + SPECIES_TO_NATIONAL(VULPIX,_ALOLAN), SPECIES_TO_NATIONAL(NINETALES), + SPECIES_TO_NATIONAL(NINETALES,_ALOLAN), SPECIES_TO_NATIONAL(JIGGLYPUFF), SPECIES_TO_NATIONAL(WIGGLYTUFF), SPECIES_TO_NATIONAL(ZUBAT), @@ -389,21 +416,29 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(VENONAT), SPECIES_TO_NATIONAL(VENOMOTH), SPECIES_TO_NATIONAL(DIGLETT), + SPECIES_TO_NATIONAL(DIGLETT,_ALOLAN), SPECIES_TO_NATIONAL(DUGTRIO), + SPECIES_TO_NATIONAL(DUGTRIO,_ALOLAN), SPECIES_TO_NATIONAL(MEOWTH), + SPECIES_TO_NATIONAL(MEOWTH,_ALOLAN), + SPECIES_TO_NATIONAL(MEOWTH,_GALARIAN), SPECIES_TO_NATIONAL(PERSIAN), + SPECIES_TO_NATIONAL(PERSIAN,_ALOLAN), SPECIES_TO_NATIONAL(PSYDUCK), SPECIES_TO_NATIONAL(GOLDUCK), SPECIES_TO_NATIONAL(MANKEY), SPECIES_TO_NATIONAL(PRIMEAPE), SPECIES_TO_NATIONAL(GROWLITHE), + SPECIES_TO_NATIONAL(GROWLITHE,_HISUIAN), SPECIES_TO_NATIONAL(ARCANINE), + SPECIES_TO_NATIONAL(ARCANINE,_HISUIAN), SPECIES_TO_NATIONAL(POLIWAG), SPECIES_TO_NATIONAL(POLIWHIRL), SPECIES_TO_NATIONAL(POLIWRATH), SPECIES_TO_NATIONAL(ABRA), SPECIES_TO_NATIONAL(KADABRA), SPECIES_TO_NATIONAL(ALAKAZAM), + SPECIES_TO_NATIONAL(ALAKAZAM,_MEGA), SPECIES_TO_NATIONAL(MACHOP), SPECIES_TO_NATIONAL(MACHOKE), SPECIES_TO_NATIONAL(MACHAMP), @@ -413,47 +448,65 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(TENTACOOL), SPECIES_TO_NATIONAL(TENTACRUEL), SPECIES_TO_NATIONAL(GEODUDE), + SPECIES_TO_NATIONAL(GEODUDE,_ALOLAN), SPECIES_TO_NATIONAL(GRAVELER), + SPECIES_TO_NATIONAL(GRAVELER,_ALOLAN), SPECIES_TO_NATIONAL(GOLEM), + SPECIES_TO_NATIONAL(GOLEM,_ALOLAN), SPECIES_TO_NATIONAL(PONYTA), + SPECIES_TO_NATIONAL(PONYTA,_GALARIAN), SPECIES_TO_NATIONAL(RAPIDASH), + SPECIES_TO_NATIONAL(RAPIDASH,_GALARIAN), SPECIES_TO_NATIONAL(SLOWPOKE), + SPECIES_TO_NATIONAL(SLOWPOKE,_GALARIAN), SPECIES_TO_NATIONAL(SLOWBRO), + SPECIES_TO_NATIONAL(SLOWBRO,_MEGA), + SPECIES_TO_NATIONAL(SLOWBRO,_GALARIAN), SPECIES_TO_NATIONAL(MAGNEMITE), SPECIES_TO_NATIONAL(MAGNETON), SPECIES_TO_NATIONAL(FARFETCHD), + SPECIES_TO_NATIONAL(FARFETCHD,_GALARIAN), SPECIES_TO_NATIONAL(DODUO), SPECIES_TO_NATIONAL(DODRIO), SPECIES_TO_NATIONAL(SEEL), SPECIES_TO_NATIONAL(DEWGONG), SPECIES_TO_NATIONAL(GRIMER), + SPECIES_TO_NATIONAL(GRIMER,_ALOLAN), SPECIES_TO_NATIONAL(MUK), + SPECIES_TO_NATIONAL(MUK,_ALOLAN), SPECIES_TO_NATIONAL(SHELLDER), SPECIES_TO_NATIONAL(CLOYSTER), SPECIES_TO_NATIONAL(GASTLY), SPECIES_TO_NATIONAL(HAUNTER), SPECIES_TO_NATIONAL(GENGAR), + SPECIES_TO_NATIONAL(GENGAR,_MEGA), SPECIES_TO_NATIONAL(ONIX), SPECIES_TO_NATIONAL(DROWZEE), SPECIES_TO_NATIONAL(HYPNO), SPECIES_TO_NATIONAL(KRABBY), SPECIES_TO_NATIONAL(KINGLER), SPECIES_TO_NATIONAL(VOLTORB), + SPECIES_TO_NATIONAL(VOLTORB,_HISUIAN), SPECIES_TO_NATIONAL(ELECTRODE), + SPECIES_TO_NATIONAL(ELECTRODE,_HISUIAN), SPECIES_TO_NATIONAL(EXEGGCUTE), SPECIES_TO_NATIONAL(EXEGGUTOR), + SPECIES_TO_NATIONAL(EXEGGUTOR,_ALOLAN), SPECIES_TO_NATIONAL(CUBONE), SPECIES_TO_NATIONAL(MAROWAK), + SPECIES_TO_NATIONAL(MAROWAK,_ALOLAN), SPECIES_TO_NATIONAL(HITMONLEE), SPECIES_TO_NATIONAL(HITMONCHAN), SPECIES_TO_NATIONAL(LICKITUNG), SPECIES_TO_NATIONAL(KOFFING), SPECIES_TO_NATIONAL(WEEZING), + SPECIES_TO_NATIONAL(WEEZING,_GALARIAN), SPECIES_TO_NATIONAL(RHYHORN), SPECIES_TO_NATIONAL(RHYDON), SPECIES_TO_NATIONAL(CHANSEY), SPECIES_TO_NATIONAL(TANGELA), SPECIES_TO_NATIONAL(KANGASKHAN), + SPECIES_TO_NATIONAL(KANGASKHAN,_MEGA), SPECIES_TO_NATIONAL(HORSEA), SPECIES_TO_NATIONAL(SEADRA), SPECIES_TO_NATIONAL(GOLDEEN), @@ -461,14 +514,17 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(STARYU), SPECIES_TO_NATIONAL(STARMIE), SPECIES_TO_NATIONAL(MR_MIME), + SPECIES_TO_NATIONAL(MR_MIME,_GALARIAN), SPECIES_TO_NATIONAL(SCYTHER), SPECIES_TO_NATIONAL(JYNX), SPECIES_TO_NATIONAL(ELECTABUZZ), SPECIES_TO_NATIONAL(MAGMAR), SPECIES_TO_NATIONAL(PINSIR), + SPECIES_TO_NATIONAL(PINSIR,_MEGA), SPECIES_TO_NATIONAL(TAUROS), SPECIES_TO_NATIONAL(MAGIKARP), SPECIES_TO_NATIONAL(GYARADOS), + SPECIES_TO_NATIONAL(GYARADOS,_MEGA), SPECIES_TO_NATIONAL(LAPRAS), SPECIES_TO_NATIONAL(DITTO), SPECIES_TO_NATIONAL(EEVEE), @@ -481,14 +537,20 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(KABUTO), SPECIES_TO_NATIONAL(KABUTOPS), SPECIES_TO_NATIONAL(AERODACTYL), + SPECIES_TO_NATIONAL(AERODACTYL,_MEGA), SPECIES_TO_NATIONAL(SNORLAX), SPECIES_TO_NATIONAL(ARTICUNO), + SPECIES_TO_NATIONAL(ARTICUNO,_GALARIAN), SPECIES_TO_NATIONAL(ZAPDOS), + SPECIES_TO_NATIONAL(ZAPDOS,_GALARIAN), SPECIES_TO_NATIONAL(MOLTRES), + SPECIES_TO_NATIONAL(MOLTRES,_GALARIAN), SPECIES_TO_NATIONAL(DRATINI), SPECIES_TO_NATIONAL(DRAGONAIR), SPECIES_TO_NATIONAL(DRAGONITE), SPECIES_TO_NATIONAL(MEWTWO), + SPECIES_TO_NATIONAL(MEWTWO,_MEGA_X), + SPECIES_TO_NATIONAL(MEWTWO,_MEGA_Y), SPECIES_TO_NATIONAL(MEW), SPECIES_TO_NATIONAL(CHIKORITA), SPECIES_TO_NATIONAL(BAYLEEF), @@ -496,6 +558,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(CYNDAQUIL), SPECIES_TO_NATIONAL(QUILAVA), SPECIES_TO_NATIONAL(TYPHLOSION), + SPECIES_TO_NATIONAL(TYPHLOSION,_HISUIAN), SPECIES_TO_NATIONAL(TOTODILE), SPECIES_TO_NATIONAL(CROCONAW), SPECIES_TO_NATIONAL(FERALIGATR), @@ -511,6 +574,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(CHINCHOU), SPECIES_TO_NATIONAL(LANTURN), SPECIES_TO_NATIONAL(PICHU), + SPECIES_TO_NATIONAL(PICHU,_SPIKY_EARED), SPECIES_TO_NATIONAL(CLEFFA), SPECIES_TO_NATIONAL(IGGLYBUFF), SPECIES_TO_NATIONAL(TOGEPI), @@ -520,6 +584,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(MAREEP), SPECIES_TO_NATIONAL(FLAAFFY), SPECIES_TO_NATIONAL(AMPHAROS), + SPECIES_TO_NATIONAL(AMPHAROS,_MEGA), SPECIES_TO_NATIONAL(BELLOSSOM), SPECIES_TO_NATIONAL(MARILL), SPECIES_TO_NATIONAL(AZUMARILL), @@ -538,35 +603,36 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(UMBREON), SPECIES_TO_NATIONAL(MURKROW), SPECIES_TO_NATIONAL(SLOWKING), + SPECIES_TO_NATIONAL(SLOWKING,_GALARIAN), SPECIES_TO_NATIONAL(MISDREAVUS), SPECIES_TO_NATIONAL(UNOWN), - [SPECIES_UNOWN_B - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_C - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_D - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_E - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_F - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_G - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_H - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_I - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_J - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_K - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_L - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_M - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_N - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_O - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_P - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_Q - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_R - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_S - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_T - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_U - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_V - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_W - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_X - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_Y - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_Z - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_QMARK - 1] = NATIONAL_DEX_UNOWN, - [SPECIES_UNOWN_EMARK - 1] = NATIONAL_DEX_UNOWN, + SPECIES_TO_NATIONAL(UNOWN,_B), + SPECIES_TO_NATIONAL(UNOWN,_C), + SPECIES_TO_NATIONAL(UNOWN,_D), + SPECIES_TO_NATIONAL(UNOWN,_E), + SPECIES_TO_NATIONAL(UNOWN,_F), + SPECIES_TO_NATIONAL(UNOWN,_G), + SPECIES_TO_NATIONAL(UNOWN,_H), + SPECIES_TO_NATIONAL(UNOWN,_I), + SPECIES_TO_NATIONAL(UNOWN,_J), + SPECIES_TO_NATIONAL(UNOWN,_K), + SPECIES_TO_NATIONAL(UNOWN,_L), + SPECIES_TO_NATIONAL(UNOWN,_M), + SPECIES_TO_NATIONAL(UNOWN,_N), + SPECIES_TO_NATIONAL(UNOWN,_O), + SPECIES_TO_NATIONAL(UNOWN,_P), + SPECIES_TO_NATIONAL(UNOWN,_Q), + SPECIES_TO_NATIONAL(UNOWN,_R), + SPECIES_TO_NATIONAL(UNOWN,_S), + SPECIES_TO_NATIONAL(UNOWN,_T), + SPECIES_TO_NATIONAL(UNOWN,_U), + SPECIES_TO_NATIONAL(UNOWN,_V), + SPECIES_TO_NATIONAL(UNOWN,_W), + SPECIES_TO_NATIONAL(UNOWN,_X), + SPECIES_TO_NATIONAL(UNOWN,_Y), + SPECIES_TO_NATIONAL(UNOWN,_Z), + SPECIES_TO_NATIONAL(UNOWN,_QMARK), + SPECIES_TO_NATIONAL(UNOWN,_EMARK), SPECIES_TO_NATIONAL(WOBBUFFET), SPECIES_TO_NATIONAL(GIRAFARIG), SPECIES_TO_NATIONAL(PINECO), @@ -574,13 +640,18 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(DUNSPARCE), SPECIES_TO_NATIONAL(GLIGAR), SPECIES_TO_NATIONAL(STEELIX), + SPECIES_TO_NATIONAL(STEELIX,_MEGA), SPECIES_TO_NATIONAL(SNUBBULL), SPECIES_TO_NATIONAL(GRANBULL), SPECIES_TO_NATIONAL(QWILFISH), + SPECIES_TO_NATIONAL(QWILFISH,_HISUIAN), SPECIES_TO_NATIONAL(SCIZOR), + SPECIES_TO_NATIONAL(SCIZOR,_MEGA), SPECIES_TO_NATIONAL(SHUCKLE), SPECIES_TO_NATIONAL(HERACROSS), + SPECIES_TO_NATIONAL(HERACROSS,_MEGA), SPECIES_TO_NATIONAL(SNEASEL), + SPECIES_TO_NATIONAL(SNEASEL,_HISUIAN), SPECIES_TO_NATIONAL(TEDDIURSA), SPECIES_TO_NATIONAL(URSARING), SPECIES_TO_NATIONAL(SLUGMA), @@ -588,6 +659,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SWINUB), SPECIES_TO_NATIONAL(PILOSWINE), SPECIES_TO_NATIONAL(CORSOLA), + SPECIES_TO_NATIONAL(CORSOLA,_GALARIAN), SPECIES_TO_NATIONAL(REMORAID), SPECIES_TO_NATIONAL(OCTILLERY), SPECIES_TO_NATIONAL(DELIBIRD), @@ -595,6 +667,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SKARMORY), SPECIES_TO_NATIONAL(HOUNDOUR), SPECIES_TO_NATIONAL(HOUNDOOM), + SPECIES_TO_NATIONAL(HOUNDOOM,_MEGA), SPECIES_TO_NATIONAL(KINGDRA), SPECIES_TO_NATIONAL(PHANPY), SPECIES_TO_NATIONAL(DONPHAN), @@ -614,22 +687,28 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(LARVITAR), SPECIES_TO_NATIONAL(PUPITAR), SPECIES_TO_NATIONAL(TYRANITAR), + SPECIES_TO_NATIONAL(TYRANITAR,_MEGA), SPECIES_TO_NATIONAL(LUGIA), SPECIES_TO_NATIONAL(HO_OH), SPECIES_TO_NATIONAL(CELEBI), SPECIES_TO_NATIONAL(TREECKO), SPECIES_TO_NATIONAL(GROVYLE), SPECIES_TO_NATIONAL(SCEPTILE), + SPECIES_TO_NATIONAL(SCEPTILE,_MEGA), SPECIES_TO_NATIONAL(TORCHIC), SPECIES_TO_NATIONAL(COMBUSKEN), SPECIES_TO_NATIONAL(BLAZIKEN), + SPECIES_TO_NATIONAL(BLAZIKEN,_MEGA), SPECIES_TO_NATIONAL(MUDKIP), SPECIES_TO_NATIONAL(MARSHTOMP), SPECIES_TO_NATIONAL(SWAMPERT), + SPECIES_TO_NATIONAL(SWAMPERT,_MEGA), SPECIES_TO_NATIONAL(POOCHYENA), SPECIES_TO_NATIONAL(MIGHTYENA), SPECIES_TO_NATIONAL(ZIGZAGOON), + SPECIES_TO_NATIONAL(ZIGZAGOON,_GALARIAN), SPECIES_TO_NATIONAL(LINOONE), + SPECIES_TO_NATIONAL(LINOONE,_GALARIAN), SPECIES_TO_NATIONAL(WURMPLE), SPECIES_TO_NATIONAL(SILCOON), SPECIES_TO_NATIONAL(BEAUTIFLY), @@ -648,6 +727,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(RALTS), SPECIES_TO_NATIONAL(KIRLIA), SPECIES_TO_NATIONAL(GARDEVOIR), + SPECIES_TO_NATIONAL(GARDEVOIR,_MEGA), SPECIES_TO_NATIONAL(SURSKIT), SPECIES_TO_NATIONAL(MASQUERAIN), SPECIES_TO_NATIONAL(SHROOMISH), @@ -668,14 +748,19 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SKITTY), SPECIES_TO_NATIONAL(DELCATTY), SPECIES_TO_NATIONAL(SABLEYE), + SPECIES_TO_NATIONAL(SABLEYE,_MEGA), SPECIES_TO_NATIONAL(MAWILE), + SPECIES_TO_NATIONAL(MAWILE,_MEGA), SPECIES_TO_NATIONAL(ARON), SPECIES_TO_NATIONAL(LAIRON), SPECIES_TO_NATIONAL(AGGRON), + SPECIES_TO_NATIONAL(AGGRON,_MEGA), SPECIES_TO_NATIONAL(MEDITITE), SPECIES_TO_NATIONAL(MEDICHAM), + SPECIES_TO_NATIONAL(MEDICHAM,_MEGA), SPECIES_TO_NATIONAL(ELECTRIKE), SPECIES_TO_NATIONAL(MANECTRIC), + SPECIES_TO_NATIONAL(MANECTRIC,_MEGA), SPECIES_TO_NATIONAL(PLUSLE), SPECIES_TO_NATIONAL(MINUN), SPECIES_TO_NATIONAL(VOLBEAT), @@ -685,10 +770,12 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SWALOT), SPECIES_TO_NATIONAL(CARVANHA), SPECIES_TO_NATIONAL(SHARPEDO), + SPECIES_TO_NATIONAL(SHARPEDO,_MEGA), SPECIES_TO_NATIONAL(WAILMER), SPECIES_TO_NATIONAL(WAILORD), SPECIES_TO_NATIONAL(NUMEL), SPECIES_TO_NATIONAL(CAMERUPT), + SPECIES_TO_NATIONAL(CAMERUPT,_MEGA), SPECIES_TO_NATIONAL(TORKOAL), SPECIES_TO_NATIONAL(SPOINK), SPECIES_TO_NATIONAL(GRUMPIG), @@ -700,6 +787,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(CACTURNE), SPECIES_TO_NATIONAL(SWABLU), SPECIES_TO_NATIONAL(ALTARIA), + SPECIES_TO_NATIONAL(ALTARIA,_MEGA), SPECIES_TO_NATIONAL(ZANGOOSE), SPECIES_TO_NATIONAL(SEVIPER), SPECIES_TO_NATIONAL(LUNATONE), @@ -716,21 +804,24 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(ARMALDO), SPECIES_TO_NATIONAL(FEEBAS), SPECIES_TO_NATIONAL(MILOTIC), - SPECIES_TO_NATIONAL(CASTFORM), - [SPECIES_CASTFORM_SUNNY - 1] = NATIONAL_DEX_CASTFORM, - [SPECIES_CASTFORM_RAINY - 1] = NATIONAL_DEX_CASTFORM, - [SPECIES_CASTFORM_SNOWY - 1] = NATIONAL_DEX_CASTFORM, + SPECIES_TO_NATIONAL(CASTFORM,_NORMAL), + SPECIES_TO_NATIONAL(CASTFORM,_SUNNY), + SPECIES_TO_NATIONAL(CASTFORM,_RAINY), + SPECIES_TO_NATIONAL(CASTFORM,_SNOWY), SPECIES_TO_NATIONAL(KECLEON), SPECIES_TO_NATIONAL(SHUPPET), SPECIES_TO_NATIONAL(BANETTE), + SPECIES_TO_NATIONAL(BANETTE,_MEGA), SPECIES_TO_NATIONAL(DUSKULL), SPECIES_TO_NATIONAL(DUSCLOPS), SPECIES_TO_NATIONAL(TROPIUS), SPECIES_TO_NATIONAL(CHIMECHO), SPECIES_TO_NATIONAL(ABSOL), + SPECIES_TO_NATIONAL(ABSOL,_MEGA), SPECIES_TO_NATIONAL(WYNAUT), SPECIES_TO_NATIONAL(SNORUNT), SPECIES_TO_NATIONAL(GLALIE), + SPECIES_TO_NATIONAL(GLALIE,_MEGA), SPECIES_TO_NATIONAL(SPHEAL), SPECIES_TO_NATIONAL(SEALEO), SPECIES_TO_NATIONAL(WALREIN), @@ -742,24 +833,30 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(BAGON), SPECIES_TO_NATIONAL(SHELGON), SPECIES_TO_NATIONAL(SALAMENCE), + SPECIES_TO_NATIONAL(SALAMENCE,_MEGA), SPECIES_TO_NATIONAL(BELDUM), SPECIES_TO_NATIONAL(METANG), SPECIES_TO_NATIONAL(METAGROSS), + SPECIES_TO_NATIONAL(METAGROSS,_MEGA), SPECIES_TO_NATIONAL(REGIROCK), SPECIES_TO_NATIONAL(REGICE), SPECIES_TO_NATIONAL(REGISTEEL), SPECIES_TO_NATIONAL(LATIAS), + SPECIES_TO_NATIONAL(LATIAS,_MEGA), SPECIES_TO_NATIONAL(LATIOS), + SPECIES_TO_NATIONAL(LATIOS,_MEGA), SPECIES_TO_NATIONAL(KYOGRE), + SPECIES_TO_NATIONAL(KYOGRE,_PRIMAL), SPECIES_TO_NATIONAL(GROUDON), + SPECIES_TO_NATIONAL(GROUDON,_PRIMAL), SPECIES_TO_NATIONAL(RAYQUAZA), + SPECIES_TO_NATIONAL(RAYQUAZA,_MEGA), SPECIES_TO_NATIONAL(JIRACHI), - SPECIES_TO_NATIONAL(DEOXYS), - [SPECIES_DEOXYS_ATTACK - 1] = NATIONAL_DEX_DEOXYS, - [SPECIES_DEOXYS_DEFENSE - 1] = NATIONAL_DEX_DEOXYS, - [SPECIES_DEOXYS_SPEED - 1] = NATIONAL_DEX_DEOXYS, + SPECIES_TO_NATIONAL(DEOXYS,_NORMAL), + SPECIES_TO_NATIONAL(DEOXYS,_ATTACK), + SPECIES_TO_NATIONAL(DEOXYS,_DEFENSE), + SPECIES_TO_NATIONAL(DEOXYS,_SPEED), #if P_GEN_4_POKEMON == TRUE -// Diamond and Pearl SPECIES_TO_NATIONAL(TURTWIG), SPECIES_TO_NATIONAL(GROTLE), SPECIES_TO_NATIONAL(TORTERRA), @@ -785,12 +882,12 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(RAMPARDOS), SPECIES_TO_NATIONAL(SHIELDON), SPECIES_TO_NATIONAL(BASTIODON), - [SPECIES_BURMY_PLANT_CLOAK - 1] = NATIONAL_DEX_BURMY, - [SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY, - [SPECIES_BURMY_TRASH_CLOAK - 1] = NATIONAL_DEX_BURMY, - [SPECIES_WORMADAM_PLANT_CLOAK - 1] = NATIONAL_DEX_WORMADAM, - [SPECIES_WORMADAM_SANDY_CLOAK - 1] = NATIONAL_DEX_WORMADAM, - [SPECIES_WORMADAM_TRASH_CLOAK - 1] = NATIONAL_DEX_WORMADAM, + SPECIES_TO_NATIONAL(BURMY,_PLANT_CLOAK), + SPECIES_TO_NATIONAL(BURMY,_SANDY_CLOAK), + SPECIES_TO_NATIONAL(BURMY,_TRASH_CLOAK), + SPECIES_TO_NATIONAL(WORMADAM,_PLANT_CLOAK), + SPECIES_TO_NATIONAL(WORMADAM,_SANDY_CLOAK), + SPECIES_TO_NATIONAL(WORMADAM,_TRASH_CLOAK), SPECIES_TO_NATIONAL(MOTHIM), SPECIES_TO_NATIONAL(COMBEE), SPECIES_TO_NATIONAL(VESPIQUEN), @@ -798,17 +895,18 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(BUIZEL), SPECIES_TO_NATIONAL(FLOATZEL), SPECIES_TO_NATIONAL(CHERUBI), - [SPECIES_CHERRIM_OVERCAST - 1] = NATIONAL_DEX_CHERRIM, - [SPECIES_CHERRIM_SUNSHINE - 1] = NATIONAL_DEX_CHERRIM, - [SPECIES_SHELLOS_WEST_SEA - 1] = NATIONAL_DEX_SHELLOS, - [SPECIES_SHELLOS_EAST_SEA - 1] = NATIONAL_DEX_SHELLOS, - [SPECIES_GASTRODON_WEST_SEA - 1] = NATIONAL_DEX_GASTRODON, - [SPECIES_GASTRODON_EAST_SEA - 1] = NATIONAL_DEX_GASTRODON, + SPECIES_TO_NATIONAL(CHERRIM,_OVERCAST), + SPECIES_TO_NATIONAL(CHERRIM,_SUNSHINE), + SPECIES_TO_NATIONAL(SHELLOS,_WEST_SEA), + SPECIES_TO_NATIONAL(SHELLOS,_EAST_SEA), + SPECIES_TO_NATIONAL(GASTRODON,_WEST_SEA), + SPECIES_TO_NATIONAL(GASTRODON,_EAST_SEA), SPECIES_TO_NATIONAL(AMBIPOM), SPECIES_TO_NATIONAL(DRIFLOON), SPECIES_TO_NATIONAL(DRIFBLIM), SPECIES_TO_NATIONAL(BUNEARY), SPECIES_TO_NATIONAL(LOPUNNY), + SPECIES_TO_NATIONAL(LOPUNNY,_MEGA), SPECIES_TO_NATIONAL(MISMAGIUS), SPECIES_TO_NATIONAL(HONCHKROW), SPECIES_TO_NATIONAL(GLAMEOW), @@ -826,9 +924,11 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(GIBLE), SPECIES_TO_NATIONAL(GABITE), SPECIES_TO_NATIONAL(GARCHOMP), + SPECIES_TO_NATIONAL(GARCHOMP,_MEGA), SPECIES_TO_NATIONAL(MUNCHLAX), SPECIES_TO_NATIONAL(RIOLU), SPECIES_TO_NATIONAL(LUCARIO), + SPECIES_TO_NATIONAL(LUCARIO,_MEGA), SPECIES_TO_NATIONAL(HIPPOPOTAS), SPECIES_TO_NATIONAL(HIPPOWDON), SPECIES_TO_NATIONAL(SKORUPI), @@ -841,6 +941,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(MANTYKE), SPECIES_TO_NATIONAL(SNOVER), SPECIES_TO_NATIONAL(ABOMASNOW), + SPECIES_TO_NATIONAL(ABOMASNOW,_MEGA), SPECIES_TO_NATIONAL(WEAVILE), SPECIES_TO_NATIONAL(MAGNEZONE), SPECIES_TO_NATIONAL(LICKILICKY), @@ -856,54 +957,53 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(MAMOSWINE), SPECIES_TO_NATIONAL(PORYGON_Z), SPECIES_TO_NATIONAL(GALLADE), + SPECIES_TO_NATIONAL(GALLADE,_MEGA), SPECIES_TO_NATIONAL(PROBOPASS), SPECIES_TO_NATIONAL(DUSKNOIR), SPECIES_TO_NATIONAL(FROSLASS), SPECIES_TO_NATIONAL(ROTOM), + SPECIES_TO_NATIONAL(ROTOM,_HEAT), + SPECIES_TO_NATIONAL(ROTOM,_WASH), + SPECIES_TO_NATIONAL(ROTOM,_FROST), + SPECIES_TO_NATIONAL(ROTOM,_FAN), + SPECIES_TO_NATIONAL(ROTOM,_MOW), SPECIES_TO_NATIONAL(UXIE), SPECIES_TO_NATIONAL(MESPRIT), SPECIES_TO_NATIONAL(AZELF), SPECIES_TO_NATIONAL(DIALGA), + SPECIES_TO_NATIONAL(DIALGA,_ORIGIN), SPECIES_TO_NATIONAL(PALKIA), + SPECIES_TO_NATIONAL(PALKIA,_ORIGIN), SPECIES_TO_NATIONAL(HEATRAN), SPECIES_TO_NATIONAL(REGIGIGAS), - SPECIES_TO_NATIONAL(GIRATINA), + SPECIES_TO_NATIONAL(GIRATINA,_ALTERED), + SPECIES_TO_NATIONAL(GIRATINA,_ORIGIN), SPECIES_TO_NATIONAL(CRESSELIA), SPECIES_TO_NATIONAL(PHIONE), SPECIES_TO_NATIONAL(MANAPHY), SPECIES_TO_NATIONAL(DARKRAI), - SPECIES_TO_NATIONAL(SHAYMIN), - SPECIES_TO_NATIONAL(ARCEUS), - [SPECIES_ARCEUS_FIGHTING - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_FLYING - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_POISON - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_GROUND - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_ROCK - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_BUG - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_GHOST - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_STEEL - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_FIRE - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_WATER - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_GRASS - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_ELECTRIC - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_PSYCHIC - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_ICE - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_DRAGON - 1] = NATIONAL_DEX_ARCEUS, - [SPECIES_ARCEUS_DARK - 1] = NATIONAL_DEX_ARCEUS, -// Platinum - [SPECIES_ROTOM_HEAT - 1] = NATIONAL_DEX_ROTOM, - [SPECIES_ROTOM_WASH - 1] = NATIONAL_DEX_ROTOM, - [SPECIES_ROTOM_FROST - 1] = NATIONAL_DEX_ROTOM, - [SPECIES_ROTOM_FAN - 1] = NATIONAL_DEX_ROTOM, - [SPECIES_ROTOM_MOW - 1] = NATIONAL_DEX_ROTOM, - [SPECIES_GIRATINA_ORIGIN - 1] = NATIONAL_DEX_GIRATINA, - [SPECIES_SHAYMIN_SKY - 1] = NATIONAL_DEX_SHAYMIN, -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED - 1] = NATIONAL_DEX_PICHU, + SPECIES_TO_NATIONAL(SHAYMIN,_LAND), + SPECIES_TO_NATIONAL(SHAYMIN,_SKY), + SPECIES_TO_NATIONAL(ARCEUS,_NORMAL), + SPECIES_TO_NATIONAL(ARCEUS,_FIGHTING), + SPECIES_TO_NATIONAL(ARCEUS,_FLYING), + SPECIES_TO_NATIONAL(ARCEUS,_POISON), + SPECIES_TO_NATIONAL(ARCEUS,_GROUND), + SPECIES_TO_NATIONAL(ARCEUS,_ROCK), + SPECIES_TO_NATIONAL(ARCEUS,_BUG), + SPECIES_TO_NATIONAL(ARCEUS,_GHOST), + SPECIES_TO_NATIONAL(ARCEUS,_STEEL), + SPECIES_TO_NATIONAL(ARCEUS,_FIRE), + SPECIES_TO_NATIONAL(ARCEUS,_WATER), + SPECIES_TO_NATIONAL(ARCEUS,_GRASS), + SPECIES_TO_NATIONAL(ARCEUS,_ELECTRIC), + SPECIES_TO_NATIONAL(ARCEUS,_PSYCHIC), + SPECIES_TO_NATIONAL(ARCEUS,_ICE), + SPECIES_TO_NATIONAL(ARCEUS,_DRAGON), + SPECIES_TO_NATIONAL(ARCEUS,_DARK), + SPECIES_TO_NATIONAL(ARCEUS,_FAIRY), #endif - #if P_GEN_5_POKEMON == TRUE -// Black and White SPECIES_TO_NATIONAL(VICTINI), SPECIES_TO_NATIONAL(SNIVY), SPECIES_TO_NATIONAL(SERVINE), @@ -914,6 +1014,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(OSHAWOTT), SPECIES_TO_NATIONAL(DEWOTT), SPECIES_TO_NATIONAL(SAMUROTT), + SPECIES_TO_NATIONAL(SAMUROTT,_HISUIAN), SPECIES_TO_NATIONAL(PATRAT), SPECIES_TO_NATIONAL(WATCHOG), SPECIES_TO_NATIONAL(LILLIPUP), @@ -942,6 +1043,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(DRILBUR), SPECIES_TO_NATIONAL(EXCADRILL), SPECIES_TO_NATIONAL(AUDINO), + SPECIES_TO_NATIONAL(AUDINO,_MEGA), SPECIES_TO_NATIONAL(TIMBURR), SPECIES_TO_NATIONAL(GURDURR), SPECIES_TO_NATIONAL(CONKELDURR), @@ -960,14 +1062,19 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(WHIMSICOTT), SPECIES_TO_NATIONAL(PETILIL), SPECIES_TO_NATIONAL(LILLIGANT), - SPECIES_TO_NATIONAL(BASCULIN), - [SPECIES_BASCULIN_BLUE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, + SPECIES_TO_NATIONAL(LILLIGANT,_HISUIAN), + SPECIES_TO_NATIONAL(BASCULIN,_RED_STRIPED), + SPECIES_TO_NATIONAL(BASCULIN,_BLUE_STRIPED), + SPECIES_TO_NATIONAL(BASCULIN,_WHITE_STRIPED), SPECIES_TO_NATIONAL(SANDILE), SPECIES_TO_NATIONAL(KROKOROK), SPECIES_TO_NATIONAL(KROOKODILE), SPECIES_TO_NATIONAL(DARUMAKA), - SPECIES_TO_NATIONAL(DARMANITAN), - [SPECIES_DARMANITAN_ZEN_MODE - 1] = NATIONAL_DEX_DARMANITAN, + SPECIES_TO_NATIONAL(DARUMAKA,_GALARIAN), + SPECIES_TO_NATIONAL(DARMANITAN,_STANDARD_MODE), + SPECIES_TO_NATIONAL(DARMANITAN,_ZEN_MODE), + SPECIES_TO_NATIONAL(DARMANITAN,_GALARIAN_STANDARD_MODE), + SPECIES_TO_NATIONAL(DARMANITAN,_GALARIAN_ZEN_MODE), SPECIES_TO_NATIONAL(MARACTUS), SPECIES_TO_NATIONAL(DWEBBLE), SPECIES_TO_NATIONAL(CRUSTLE), @@ -975,6 +1082,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SCRAFTY), SPECIES_TO_NATIONAL(SIGILYPH), SPECIES_TO_NATIONAL(YAMASK), + SPECIES_TO_NATIONAL(YAMASK,_GALARIAN), SPECIES_TO_NATIONAL(COFAGRIGUS), SPECIES_TO_NATIONAL(TIRTOUGA), SPECIES_TO_NATIONAL(CARRACOSTA), @@ -983,7 +1091,9 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(TRUBBISH), SPECIES_TO_NATIONAL(GARBODOR), SPECIES_TO_NATIONAL(ZORUA), + SPECIES_TO_NATIONAL(ZORUA,_HISUIAN), SPECIES_TO_NATIONAL(ZOROARK), + SPECIES_TO_NATIONAL(ZOROARK,_HISUIAN), SPECIES_TO_NATIONAL(MINCCINO), SPECIES_TO_NATIONAL(CINCCINO), SPECIES_TO_NATIONAL(GOTHITA), @@ -997,14 +1107,14 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(VANILLITE), SPECIES_TO_NATIONAL(VANILLISH), SPECIES_TO_NATIONAL(VANILLUXE), - SPECIES_TO_NATIONAL(DEERLING), - [SPECIES_DEERLING_SUMMER - 1] = NATIONAL_DEX_DEERLING, - [SPECIES_DEERLING_AUTUMN - 1] = NATIONAL_DEX_DEERLING, - [SPECIES_DEERLING_WINTER - 1] = NATIONAL_DEX_DEERLING, - SPECIES_TO_NATIONAL(SAWSBUCK), - [SPECIES_SAWSBUCK_SUMMER - 1] = NATIONAL_DEX_SAWSBUCK, - [SPECIES_SAWSBUCK_AUTUMN - 1] = NATIONAL_DEX_SAWSBUCK, - [SPECIES_SAWSBUCK_WINTER - 1] = NATIONAL_DEX_SAWSBUCK, + SPECIES_TO_NATIONAL(DEERLING,_SPRING), + SPECIES_TO_NATIONAL(DEERLING,_SUMMER), + SPECIES_TO_NATIONAL(DEERLING,_AUTUMN), + SPECIES_TO_NATIONAL(DEERLING,_WINTER), + SPECIES_TO_NATIONAL(SAWSBUCK,_SPRING), + SPECIES_TO_NATIONAL(SAWSBUCK,_SUMMER), + SPECIES_TO_NATIONAL(SAWSBUCK,_AUTUMN), + SPECIES_TO_NATIONAL(SAWSBUCK,_WINTER), SPECIES_TO_NATIONAL(EMOLGA), SPECIES_TO_NATIONAL(KARRABLAST), SPECIES_TO_NATIONAL(ESCAVALIER), @@ -1037,6 +1147,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SHELMET), SPECIES_TO_NATIONAL(ACCELGOR), SPECIES_TO_NATIONAL(STUNFISK), + SPECIES_TO_NATIONAL(STUNFISK,_GALARIAN), SPECIES_TO_NATIONAL(MIENFOO), SPECIES_TO_NATIONAL(MIENSHAO), SPECIES_TO_NATIONAL(DRUDDIGON), @@ -1047,6 +1158,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(BOUFFALANT), SPECIES_TO_NATIONAL(RUFFLET), SPECIES_TO_NATIONAL(BRAVIARY), + SPECIES_TO_NATIONAL(BRAVIARY,_HISUIAN), SPECIES_TO_NATIONAL(VULLABY), SPECIES_TO_NATIONAL(MANDIBUZZ), SPECIES_TO_NATIONAL(HEATMOR), @@ -1059,30 +1171,28 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(COBALION), SPECIES_TO_NATIONAL(TERRAKION), SPECIES_TO_NATIONAL(VIRIZION), - SPECIES_TO_NATIONAL(TORNADUS), - SPECIES_TO_NATIONAL(THUNDURUS), + SPECIES_TO_NATIONAL(TORNADUS,_INCARNATE), + SPECIES_TO_NATIONAL(TORNADUS,_THERIAN), + SPECIES_TO_NATIONAL(THUNDURUS,_INCARNATE), + SPECIES_TO_NATIONAL(THUNDURUS,_THERIAN), SPECIES_TO_NATIONAL(RESHIRAM), SPECIES_TO_NATIONAL(ZEKROM), - SPECIES_TO_NATIONAL(LANDORUS), + SPECIES_TO_NATIONAL(LANDORUS,_INCARNATE), + SPECIES_TO_NATIONAL(LANDORUS,_THERIAN), SPECIES_TO_NATIONAL(KYUREM), - SPECIES_TO_NATIONAL(KELDEO), - SPECIES_TO_NATIONAL(MELOETTA), - [SPECIES_MELOETTA_PIROUETTE - 1] = NATIONAL_DEX_MELOETTA, + SPECIES_TO_NATIONAL(KYUREM,_BLACK), + SPECIES_TO_NATIONAL(KYUREM,_WHITE), + SPECIES_TO_NATIONAL(KELDEO,_ORDINARY), + SPECIES_TO_NATIONAL(KELDEO,_RESOLUTE), + SPECIES_TO_NATIONAL(MELOETTA,_ARIA), + SPECIES_TO_NATIONAL(MELOETTA,_PIROUETTE), SPECIES_TO_NATIONAL(GENESECT), - [SPECIES_GENESECT_DOUSE_DRIVE - 1] = NATIONAL_DEX_GENESECT, - [SPECIES_GENESECT_SHOCK_DRIVE - 1] = NATIONAL_DEX_GENESECT, - [SPECIES_GENESECT_BURN_DRIVE - 1] = NATIONAL_DEX_GENESECT, - [SPECIES_GENESECT_CHILL_DRIVE - 1] = NATIONAL_DEX_GENESECT, -// Black 2 and White 2 - [SPECIES_TORNADUS_THERIAN - 1] = NATIONAL_DEX_TORNADUS, - [SPECIES_THUNDURUS_THERIAN - 1] = NATIONAL_DEX_THUNDURUS, - [SPECIES_LANDORUS_THERIAN - 1] = NATIONAL_DEX_LANDORUS, - [SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM, - [SPECIES_KYUREM_WHITE - 1] = NATIONAL_DEX_KYUREM, - [SPECIES_KELDEO_RESOLUTE - 1] = NATIONAL_DEX_KELDEO, + SPECIES_TO_NATIONAL(GENESECT,_DOUSE_DRIVE), + SPECIES_TO_NATIONAL(GENESECT,_SHOCK_DRIVE), + SPECIES_TO_NATIONAL(GENESECT,_BURN_DRIVE), + SPECIES_TO_NATIONAL(GENESECT,_CHILL_DRIVE), #endif #if P_GEN_6_POKEMON == TRUE -// X and Y SPECIES_TO_NATIONAL(CHESPIN), SPECIES_TO_NATIONAL(QUILLADIN), SPECIES_TO_NATIONAL(CHESNAUGHT), @@ -1092,6 +1202,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(FROAKIE), SPECIES_TO_NATIONAL(FROGADIER), SPECIES_TO_NATIONAL(GRENINJA), + SPECIES_TO_NATIONAL(GRENINJA,_BATTLE_BOND), + SPECIES_TO_NATIONAL(GRENINJA,_ASH), SPECIES_TO_NATIONAL(BUNNELBY), SPECIES_TO_NATIONAL(DIGGERSBY), SPECIES_TO_NATIONAL(FLETCHLING), @@ -1099,22 +1211,65 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(TALONFLAME), SPECIES_TO_NATIONAL(SCATTERBUG), SPECIES_TO_NATIONAL(SPEWPA), - SPECIES_TO_NATIONAL(VIVILLON), + SPECIES_TO_NATIONAL(VIVILLON,_ICY_SNOW), + SPECIES_TO_NATIONAL(VIVILLON,_POLAR), + SPECIES_TO_NATIONAL(VIVILLON,_TUNDRA), + SPECIES_TO_NATIONAL(VIVILLON,_CONTINENTAL), + SPECIES_TO_NATIONAL(VIVILLON,_GARDEN), + SPECIES_TO_NATIONAL(VIVILLON,_ELEGANT), + SPECIES_TO_NATIONAL(VIVILLON,_MEADOW), + SPECIES_TO_NATIONAL(VIVILLON,_MODERN), + SPECIES_TO_NATIONAL(VIVILLON,_MARINE), + SPECIES_TO_NATIONAL(VIVILLON,_ARCHIPELAGO), + SPECIES_TO_NATIONAL(VIVILLON,_HIGH_PLAINS), + SPECIES_TO_NATIONAL(VIVILLON,_SANDSTORM), + SPECIES_TO_NATIONAL(VIVILLON,_RIVER), + SPECIES_TO_NATIONAL(VIVILLON,_MONSOON), + SPECIES_TO_NATIONAL(VIVILLON,_SAVANNA), + SPECIES_TO_NATIONAL(VIVILLON,_SUN), + SPECIES_TO_NATIONAL(VIVILLON,_OCEAN), + SPECIES_TO_NATIONAL(VIVILLON,_JUNGLE), + SPECIES_TO_NATIONAL(VIVILLON,_FANCY), + SPECIES_TO_NATIONAL(VIVILLON,_POKE_BALL), SPECIES_TO_NATIONAL(LITLEO), SPECIES_TO_NATIONAL(PYROAR), - SPECIES_TO_NATIONAL(FLABEBE), - SPECIES_TO_NATIONAL(FLOETTE), - SPECIES_TO_NATIONAL(FLORGES), + SPECIES_TO_NATIONAL(FLABEBE,_RED_FLOWER), + SPECIES_TO_NATIONAL(FLABEBE,_YELLOW_FLOWER), + SPECIES_TO_NATIONAL(FLABEBE,_ORANGE_FLOWER), + SPECIES_TO_NATIONAL(FLABEBE,_BLUE_FLOWER), + SPECIES_TO_NATIONAL(FLABEBE,_WHITE_FLOWER), + SPECIES_TO_NATIONAL(FLOETTE,_RED_FLOWER), + SPECIES_TO_NATIONAL(FLOETTE,_YELLOW_FLOWER), + SPECIES_TO_NATIONAL(FLOETTE,_ORANGE_FLOWER), + SPECIES_TO_NATIONAL(FLOETTE,_BLUE_FLOWER), + SPECIES_TO_NATIONAL(FLOETTE,_WHITE_FLOWER), + SPECIES_TO_NATIONAL(FLOETTE,_ETERNAL_FLOWER), + SPECIES_TO_NATIONAL(FLORGES,_RED_FLOWER), + SPECIES_TO_NATIONAL(FLORGES,_YELLOW_FLOWER), + SPECIES_TO_NATIONAL(FLORGES,_ORANGE_FLOWER), + SPECIES_TO_NATIONAL(FLORGES,_BLUE_FLOWER), + SPECIES_TO_NATIONAL(FLORGES,_WHITE_FLOWER), SPECIES_TO_NATIONAL(SKIDDO), SPECIES_TO_NATIONAL(GOGOAT), SPECIES_TO_NATIONAL(PANCHAM), SPECIES_TO_NATIONAL(PANGORO), - SPECIES_TO_NATIONAL(FURFROU), + SPECIES_TO_NATIONAL(FURFROU,_NATURAL), + SPECIES_TO_NATIONAL(FURFROU,_HEART_TRIM), + SPECIES_TO_NATIONAL(FURFROU,_STAR_TRIM), + SPECIES_TO_NATIONAL(FURFROU,_DIAMOND_TRIM), + SPECIES_TO_NATIONAL(FURFROU,_DEBUTANTE_TRIM), + SPECIES_TO_NATIONAL(FURFROU,_MATRON_TRIM), + SPECIES_TO_NATIONAL(FURFROU,_DANDY_TRIM), + SPECIES_TO_NATIONAL(FURFROU,_LA_REINE_TRIM), + SPECIES_TO_NATIONAL(FURFROU,_KABUKI_TRIM), + SPECIES_TO_NATIONAL(FURFROU,_PHARAOH_TRIM), SPECIES_TO_NATIONAL(ESPURR), - SPECIES_TO_NATIONAL(MEOWSTIC), + SPECIES_TO_NATIONAL(MEOWSTIC,_MALE), + SPECIES_TO_NATIONAL(MEOWSTIC,_FEMALE), SPECIES_TO_NATIONAL(HONEDGE), SPECIES_TO_NATIONAL(DOUBLADE), - SPECIES_TO_NATIONAL(AEGISLASH), + SPECIES_TO_NATIONAL(AEGISLASH,_SHIELD), + SPECIES_TO_NATIONAL(AEGISLASH,_BLADE), SPECIES_TO_NATIONAL(SPRITZEE), SPECIES_TO_NATIONAL(AROMATISSE), SPECIES_TO_NATIONAL(SWIRLIX), @@ -1139,27 +1294,44 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(CARBINK), SPECIES_TO_NATIONAL(GOOMY), SPECIES_TO_NATIONAL(SLIGGOO), + SPECIES_TO_NATIONAL(SLIGGOO,_HISUIAN), SPECIES_TO_NATIONAL(GOODRA), + SPECIES_TO_NATIONAL(GOODRA,_HISUIAN), SPECIES_TO_NATIONAL(KLEFKI), SPECIES_TO_NATIONAL(PHANTUMP), SPECIES_TO_NATIONAL(TREVENANT), - SPECIES_TO_NATIONAL(PUMPKABOO), - SPECIES_TO_NATIONAL(GOURGEIST), + SPECIES_TO_NATIONAL(PUMPKABOO,_AVERAGE), + SPECIES_TO_NATIONAL(PUMPKABOO,_SMALL), + SPECIES_TO_NATIONAL(PUMPKABOO,_LARGE), + SPECIES_TO_NATIONAL(PUMPKABOO,_SUPER), + SPECIES_TO_NATIONAL(GOURGEIST,_AVERAGE), + SPECIES_TO_NATIONAL(GOURGEIST,_SMALL), + SPECIES_TO_NATIONAL(GOURGEIST,_LARGE), + SPECIES_TO_NATIONAL(GOURGEIST,_SUPER), SPECIES_TO_NATIONAL(BERGMITE), SPECIES_TO_NATIONAL(AVALUGG), + SPECIES_TO_NATIONAL(AVALUGG,_HISUIAN), SPECIES_TO_NATIONAL(NOIBAT), SPECIES_TO_NATIONAL(NOIVERN), - SPECIES_TO_NATIONAL(XERNEAS), + SPECIES_TO_NATIONAL(XERNEAS,_NEUTRAL), + SPECIES_TO_NATIONAL(XERNEAS,_ACTIVE), SPECIES_TO_NATIONAL(YVELTAL), - SPECIES_TO_NATIONAL(ZYGARDE), + SPECIES_TO_NATIONAL(ZYGARDE,_50), + SPECIES_TO_NATIONAL(ZYGARDE,_10), + SPECIES_TO_NATIONAL(ZYGARDE,_10_POWER_CONSTRUCT), + SPECIES_TO_NATIONAL(ZYGARDE,_50_POWER_CONSTRUCT), + SPECIES_TO_NATIONAL(ZYGARDE,_COMPLETE), SPECIES_TO_NATIONAL(DIANCIE), - SPECIES_TO_NATIONAL(HOOPA), + SPECIES_TO_NATIONAL(DIANCIE,_MEGA), + SPECIES_TO_NATIONAL(HOOPA,_CONFINED), + SPECIES_TO_NATIONAL(HOOPA,_UNBOUND), SPECIES_TO_NATIONAL(VOLCANION), #endif #if P_GEN_7_POKEMON == TRUE SPECIES_TO_NATIONAL(ROWLET), SPECIES_TO_NATIONAL(DARTRIX), SPECIES_TO_NATIONAL(DECIDUEYE), + SPECIES_TO_NATIONAL(DECIDUEYE,_HISUIAN), SPECIES_TO_NATIONAL(LITTEN), SPECIES_TO_NATIONAL(TORRACAT), SPECIES_TO_NATIONAL(INCINEROAR), @@ -1176,12 +1348,19 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(VIKAVOLT), SPECIES_TO_NATIONAL(CRABRAWLER), SPECIES_TO_NATIONAL(CRABOMINABLE), - SPECIES_TO_NATIONAL(ORICORIO), + SPECIES_TO_NATIONAL(ORICORIO,_BAILE), + SPECIES_TO_NATIONAL(ORICORIO,_POM_POM), + SPECIES_TO_NATIONAL(ORICORIO,_PAU), + SPECIES_TO_NATIONAL(ORICORIO,_SENSU), SPECIES_TO_NATIONAL(CUTIEFLY), SPECIES_TO_NATIONAL(RIBOMBEE), SPECIES_TO_NATIONAL(ROCKRUFF), - SPECIES_TO_NATIONAL(LYCANROC), - SPECIES_TO_NATIONAL(WISHIWASHI), + SPECIES_TO_NATIONAL(ROCKRUFF,_OWN_TEMPO), + SPECIES_TO_NATIONAL(LYCANROC,_MIDDAY), + SPECIES_TO_NATIONAL(LYCANROC,_MIDNIGHT), + SPECIES_TO_NATIONAL(LYCANROC,_DUSK), + SPECIES_TO_NATIONAL(WISHIWASHI,_SOLO), + SPECIES_TO_NATIONAL(WISHIWASHI,_SCHOOL), SPECIES_TO_NATIONAL(MAREANIE), SPECIES_TO_NATIONAL(TOXAPEX), SPECIES_TO_NATIONAL(MUDBRAY), @@ -1208,12 +1387,43 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(PALOSSAND), SPECIES_TO_NATIONAL(PYUKUMUKU), SPECIES_TO_NATIONAL(TYPE_NULL), - SPECIES_TO_NATIONAL(SILVALLY), - SPECIES_TO_NATIONAL(MINIOR), + SPECIES_TO_NATIONAL(SILVALLY,_NORMAL), + SPECIES_TO_NATIONAL(SILVALLY,_FIGHTING), + SPECIES_TO_NATIONAL(SILVALLY,_FLYING), + SPECIES_TO_NATIONAL(SILVALLY,_POISON), + SPECIES_TO_NATIONAL(SILVALLY,_GROUND), + SPECIES_TO_NATIONAL(SILVALLY,_ROCK), + SPECIES_TO_NATIONAL(SILVALLY,_BUG), + SPECIES_TO_NATIONAL(SILVALLY,_GHOST), + SPECIES_TO_NATIONAL(SILVALLY,_STEEL), + SPECIES_TO_NATIONAL(SILVALLY,_FIRE), + SPECIES_TO_NATIONAL(SILVALLY,_WATER), + SPECIES_TO_NATIONAL(SILVALLY,_GRASS), + SPECIES_TO_NATIONAL(SILVALLY,_ELECTRIC), + SPECIES_TO_NATIONAL(SILVALLY,_PSYCHIC), + SPECIES_TO_NATIONAL(SILVALLY,_ICE), + SPECIES_TO_NATIONAL(SILVALLY,_DRAGON), + SPECIES_TO_NATIONAL(SILVALLY,_DARK), + SPECIES_TO_NATIONAL(SILVALLY,_FAIRY), + SPECIES_TO_NATIONAL(MINIOR,_METEOR_RED), + SPECIES_TO_NATIONAL(MINIOR,_METEOR_ORANGE), + SPECIES_TO_NATIONAL(MINIOR,_METEOR_YELLOW), + SPECIES_TO_NATIONAL(MINIOR,_METEOR_GREEN), + SPECIES_TO_NATIONAL(MINIOR,_METEOR_BLUE), + SPECIES_TO_NATIONAL(MINIOR,_METEOR_INDIGO), + SPECIES_TO_NATIONAL(MINIOR,_METEOR_VIOLET), + SPECIES_TO_NATIONAL(MINIOR,_CORE_RED), + SPECIES_TO_NATIONAL(MINIOR,_CORE_ORANGE), + SPECIES_TO_NATIONAL(MINIOR,_CORE_YELLOW), + SPECIES_TO_NATIONAL(MINIOR,_CORE_GREEN), + SPECIES_TO_NATIONAL(MINIOR,_CORE_BLUE), + SPECIES_TO_NATIONAL(MINIOR,_CORE_INDIGO), + SPECIES_TO_NATIONAL(MINIOR,_CORE_VIOLET), SPECIES_TO_NATIONAL(KOMALA), SPECIES_TO_NATIONAL(TURTONATOR), SPECIES_TO_NATIONAL(TOGEDEMARU), - SPECIES_TO_NATIONAL(MIMIKYU), + SPECIES_TO_NATIONAL(MIMIKYU,_DISGUISED), + SPECIES_TO_NATIONAL(MIMIKYU,_BUSTED), SPECIES_TO_NATIONAL(BRUXISH), SPECIES_TO_NATIONAL(DRAMPA), SPECIES_TO_NATIONAL(DHELMISE), @@ -1236,7 +1446,11 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(KARTANA), SPECIES_TO_NATIONAL(GUZZLORD), SPECIES_TO_NATIONAL(NECROZMA), + SPECIES_TO_NATIONAL(NECROZMA,_DUSK_MANE), + SPECIES_TO_NATIONAL(NECROZMA,_DAWN_WINGS), + SPECIES_TO_NATIONAL(NECROZMA,_ULTRA), SPECIES_TO_NATIONAL(MAGEARNA), + SPECIES_TO_NATIONAL(MAGEARNA,_ORIGINAL_COLOR), SPECIES_TO_NATIONAL(MARSHADOW), SPECIES_TO_NATIONAL(POIPOLE), SPECIES_TO_NATIONAL(NAGANADEL), @@ -1283,16 +1497,21 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SILICOBRA), SPECIES_TO_NATIONAL(SANDACONDA), SPECIES_TO_NATIONAL(CRAMORANT), + SPECIES_TO_NATIONAL(CRAMORANT,_GULPING), + SPECIES_TO_NATIONAL(CRAMORANT,_GORGING), SPECIES_TO_NATIONAL(ARROKUDA), SPECIES_TO_NATIONAL(BARRASKEWDA), SPECIES_TO_NATIONAL(TOXEL), - SPECIES_TO_NATIONAL(TOXTRICITY), + SPECIES_TO_NATIONAL(TOXTRICITY,_AMPED), + SPECIES_TO_NATIONAL(TOXTRICITY,_LOW_KEY), SPECIES_TO_NATIONAL(SIZZLIPEDE), SPECIES_TO_NATIONAL(CENTISKORCH), SPECIES_TO_NATIONAL(CLOBBOPUS), SPECIES_TO_NATIONAL(GRAPPLOCT), - SPECIES_TO_NATIONAL(SINISTEA), - SPECIES_TO_NATIONAL(POLTEAGEIST), + SPECIES_TO_NATIONAL(SINISTEA,_PHONY), + SPECIES_TO_NATIONAL(SINISTEA,_ANTIQUE), + SPECIES_TO_NATIONAL(POLTEAGEIST,_PHONY), + SPECIES_TO_NATIONAL(POLTEAGEIST,_ANTIQUE), SPECIES_TO_NATIONAL(HATENNA), SPECIES_TO_NATIONAL(HATTREM), SPECIES_TO_NATIONAL(HATTERENE), @@ -1307,14 +1526,25 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(RUNERIGUS), SPECIES_TO_NATIONAL(MILCERY), SPECIES_TO_NATIONAL(ALCREMIE), + SPECIES_TO_NATIONAL(ALCREMIE,_STRAWBERRY_RUBY_CREAM), + SPECIES_TO_NATIONAL(ALCREMIE,_STRAWBERRY_MATCHA_CREAM), + SPECIES_TO_NATIONAL(ALCREMIE,_STRAWBERRY_MINT_CREAM), + SPECIES_TO_NATIONAL(ALCREMIE,_STRAWBERRY_LEMON_CREAM), + SPECIES_TO_NATIONAL(ALCREMIE,_STRAWBERRY_SALTED_CREAM), + SPECIES_TO_NATIONAL(ALCREMIE,_STRAWBERRY_RUBY_SWIRL), + SPECIES_TO_NATIONAL(ALCREMIE,_STRAWBERRY_CARAMEL_SWIRL), + SPECIES_TO_NATIONAL(ALCREMIE,_STRAWBERRY_RAINBOW_SWIRL), SPECIES_TO_NATIONAL(FALINKS), SPECIES_TO_NATIONAL(PINCURCHIN), SPECIES_TO_NATIONAL(SNOM), SPECIES_TO_NATIONAL(FROSMOTH), SPECIES_TO_NATIONAL(STONJOURNER), - SPECIES_TO_NATIONAL(EISCUE), - SPECIES_TO_NATIONAL(INDEEDEE), - SPECIES_TO_NATIONAL(MORPEKO), + SPECIES_TO_NATIONAL(EISCUE,_ICE_FACE), + SPECIES_TO_NATIONAL(EISCUE,_NOICE_FACE), + SPECIES_TO_NATIONAL(INDEEDEE,_MALE), + SPECIES_TO_NATIONAL(INDEEDEE,_FEMALE), + SPECIES_TO_NATIONAL(MORPEKO,_FULL_BELLY), + SPECIES_TO_NATIONAL(MORPEKO,_HANGRY), SPECIES_TO_NATIONAL(CUFANT), SPECIES_TO_NATIONAL(COPPERAJAH), SPECIES_TO_NATIONAL(DRACOZOLT), @@ -1325,17 +1555,24 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(DREEPY), SPECIES_TO_NATIONAL(DRAKLOAK), SPECIES_TO_NATIONAL(DRAGAPULT), - SPECIES_TO_NATIONAL(ZACIAN), - SPECIES_TO_NATIONAL(ZAMAZENTA), + SPECIES_TO_NATIONAL(ZACIAN,_HERO_OF_MANY_BATTLES), + SPECIES_TO_NATIONAL(ZACIAN,_CROWNED_SWORD), + SPECIES_TO_NATIONAL(ZAMAZENTA,_HERO_OF_MANY_BATTLES), + SPECIES_TO_NATIONAL(ZAMAZENTA,_CROWNED_SHIELD), SPECIES_TO_NATIONAL(ETERNATUS), + SPECIES_TO_NATIONAL(ETERNATUS,_ETERNAMAX), SPECIES_TO_NATIONAL(KUBFU), - SPECIES_TO_NATIONAL(URSHIFU), + SPECIES_TO_NATIONAL(URSHIFU,_SINGLE_STRIKE_STYLE), + SPECIES_TO_NATIONAL(URSHIFU,_RAPID_STRIKE_STYLE), SPECIES_TO_NATIONAL(ZARUDE), + SPECIES_TO_NATIONAL(ZARUDE,_DADA), SPECIES_TO_NATIONAL(REGIELEKI), SPECIES_TO_NATIONAL(REGIDRAGO), SPECIES_TO_NATIONAL(GLASTRIER), SPECIES_TO_NATIONAL(SPECTRIER), SPECIES_TO_NATIONAL(CALYREX), + SPECIES_TO_NATIONAL(CALYREX,_ICE_RIDER), + SPECIES_TO_NATIONAL(CALYREX,_SHADOW_RIDER), SPECIES_TO_NATIONAL(WYRDEER), SPECIES_TO_NATIONAL(KLEAVOR), SPECIES_TO_NATIONAL(URSALUNA), @@ -1343,324 +1580,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SNEASLER), SPECIES_TO_NATIONAL(OVERQWIL), SPECIES_TO_NATIONAL(ENAMORUS), -#endif - - // Megas - [SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR, - [SPECIES_CHARIZARD_MEGA_X - 1] = NATIONAL_DEX_CHARIZARD, - [SPECIES_CHARIZARD_MEGA_Y - 1] = NATIONAL_DEX_CHARIZARD, - [SPECIES_BLASTOISE_MEGA - 1] = NATIONAL_DEX_BLASTOISE, - [SPECIES_BEEDRILL_MEGA - 1] = NATIONAL_DEX_BEEDRILL, - [SPECIES_PIDGEOT_MEGA - 1] = NATIONAL_DEX_PIDGEOT, - [SPECIES_ALAKAZAM_MEGA - 1] = NATIONAL_DEX_ALAKAZAM, - [SPECIES_SLOWBRO_MEGA - 1] = NATIONAL_DEX_SLOWBRO, - [SPECIES_GENGAR_MEGA - 1] = NATIONAL_DEX_GENGAR, - [SPECIES_KANGASKHAN_MEGA - 1] = NATIONAL_DEX_KANGASKHAN, - [SPECIES_PINSIR_MEGA - 1] = NATIONAL_DEX_PINSIR, - [SPECIES_GYARADOS_MEGA - 1] = NATIONAL_DEX_GYARADOS, - [SPECIES_AERODACTYL_MEGA - 1] = NATIONAL_DEX_AERODACTYL, - [SPECIES_MEWTWO_MEGA_X - 1] = NATIONAL_DEX_MEWTWO, - [SPECIES_MEWTWO_MEGA_Y - 1] = NATIONAL_DEX_MEWTWO, - [SPECIES_AMPHAROS_MEGA - 1] = NATIONAL_DEX_AMPHAROS, - [SPECIES_STEELIX_MEGA - 1] = NATIONAL_DEX_STEELIX, - [SPECIES_SCIZOR_MEGA - 1] = NATIONAL_DEX_SCIZOR, - [SPECIES_HERACROSS_MEGA - 1] = NATIONAL_DEX_HERACROSS, - [SPECIES_HOUNDOOM_MEGA - 1] = NATIONAL_DEX_HOUNDOOM, - [SPECIES_TYRANITAR_MEGA - 1] = NATIONAL_DEX_TYRANITAR, - [SPECIES_SCEPTILE_MEGA - 1] = NATIONAL_DEX_SCEPTILE, - [SPECIES_BLAZIKEN_MEGA - 1] = NATIONAL_DEX_BLAZIKEN, - [SPECIES_SWAMPERT_MEGA - 1] = NATIONAL_DEX_SWAMPERT, - [SPECIES_GARDEVOIR_MEGA - 1] = NATIONAL_DEX_GARDEVOIR, - [SPECIES_SABLEYE_MEGA - 1] = NATIONAL_DEX_SABLEYE, - [SPECIES_MAWILE_MEGA - 1] = NATIONAL_DEX_MAWILE, - [SPECIES_AGGRON_MEGA - 1] = NATIONAL_DEX_AGGRON, - [SPECIES_MEDICHAM_MEGA - 1] = NATIONAL_DEX_MEDICHAM, - [SPECIES_MANECTRIC_MEGA - 1] = NATIONAL_DEX_MANECTRIC, - [SPECIES_SHARPEDO_MEGA - 1] = NATIONAL_DEX_SHARPEDO, - [SPECIES_CAMERUPT_MEGA - 1] = NATIONAL_DEX_CAMERUPT, - [SPECIES_ALTARIA_MEGA - 1] = NATIONAL_DEX_ALTARIA, - [SPECIES_BANETTE_MEGA - 1] = NATIONAL_DEX_BANETTE, - [SPECIES_ABSOL_MEGA - 1] = NATIONAL_DEX_ABSOL, - [SPECIES_GLALIE_MEGA - 1] = NATIONAL_DEX_GLALIE, - [SPECIES_SALAMENCE_MEGA - 1] = NATIONAL_DEX_SALAMENCE, - [SPECIES_METAGROSS_MEGA - 1] = NATIONAL_DEX_METAGROSS, - [SPECIES_LATIAS_MEGA - 1] = NATIONAL_DEX_LATIAS, - [SPECIES_LATIOS_MEGA - 1] = NATIONAL_DEX_LATIOS, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA - 1] = NATIONAL_DEX_LOPUNNY, - [SPECIES_GARCHOMP_MEGA - 1] = NATIONAL_DEX_GARCHOMP, - [SPECIES_LUCARIO_MEGA - 1] = NATIONAL_DEX_LUCARIO, - [SPECIES_ABOMASNOW_MEGA - 1] = NATIONAL_DEX_ABOMASNOW, - [SPECIES_GALLADE_MEGA - 1] = NATIONAL_DEX_GALLADE, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA - 1] = NATIONAL_DEX_AUDINO, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA - 1] = NATIONAL_DEX_DIANCIE, -#endif - // Special Mega + Primals - [SPECIES_RAYQUAZA_MEGA - 1] = NATIONAL_DEX_RAYQUAZA, - [SPECIES_KYOGRE_PRIMAL - 1] = NATIONAL_DEX_KYOGRE, - [SPECIES_GROUDON_PRIMAL - 1] = NATIONAL_DEX_GROUDON, - // Alolan Forms - [SPECIES_RATTATA_ALOLAN - 1] = NATIONAL_DEX_RATTATA, - [SPECIES_RATICATE_ALOLAN - 1] = NATIONAL_DEX_RATICATE, - [SPECIES_RAICHU_ALOLAN - 1] = NATIONAL_DEX_RAICHU, - [SPECIES_SANDSHREW_ALOLAN - 1] = NATIONAL_DEX_SANDSHREW, - [SPECIES_SANDSLASH_ALOLAN - 1] = NATIONAL_DEX_SANDSLASH, - [SPECIES_VULPIX_ALOLAN - 1] = NATIONAL_DEX_VULPIX, - [SPECIES_NINETALES_ALOLAN - 1] = NATIONAL_DEX_NINETALES, - [SPECIES_DIGLETT_ALOLAN - 1] = NATIONAL_DEX_DIGLETT, - [SPECIES_DUGTRIO_ALOLAN - 1] = NATIONAL_DEX_DUGTRIO, - [SPECIES_MEOWTH_ALOLAN - 1] = NATIONAL_DEX_MEOWTH, - [SPECIES_PERSIAN_ALOLAN - 1] = NATIONAL_DEX_PERSIAN, - [SPECIES_GEODUDE_ALOLAN - 1] = NATIONAL_DEX_GEODUDE, - [SPECIES_GRAVELER_ALOLAN - 1] = NATIONAL_DEX_GRAVELER, - [SPECIES_GOLEM_ALOLAN - 1] = NATIONAL_DEX_GOLEM, - [SPECIES_GRIMER_ALOLAN - 1] = NATIONAL_DEX_GRIMER, - [SPECIES_MUK_ALOLAN - 1] = NATIONAL_DEX_MUK, - [SPECIES_EXEGGUTOR_ALOLAN - 1] = NATIONAL_DEX_EXEGGUTOR, - [SPECIES_MAROWAK_ALOLAN - 1] = NATIONAL_DEX_MAROWAK, - // Galarian Forms - [SPECIES_MEOWTH_GALARIAN - 1] = NATIONAL_DEX_MEOWTH, - [SPECIES_PONYTA_GALARIAN - 1] = NATIONAL_DEX_PONYTA, - [SPECIES_RAPIDASH_GALARIAN - 1] = NATIONAL_DEX_RAPIDASH, - [SPECIES_SLOWPOKE_GALARIAN - 1] = NATIONAL_DEX_SLOWPOKE, - [SPECIES_SLOWBRO_GALARIAN - 1] = NATIONAL_DEX_SLOWBRO, - [SPECIES_FARFETCHD_GALARIAN - 1] = NATIONAL_DEX_FARFETCHD, - [SPECIES_WEEZING_GALARIAN - 1] = NATIONAL_DEX_WEEZING, - [SPECIES_MR_MIME_GALARIAN - 1] = NATIONAL_DEX_MR_MIME, - [SPECIES_ARTICUNO_GALARIAN - 1] = NATIONAL_DEX_ARTICUNO, - [SPECIES_ZAPDOS_GALARIAN - 1] = NATIONAL_DEX_ZAPDOS, - [SPECIES_MOLTRES_GALARIAN - 1] = NATIONAL_DEX_MOLTRES, - [SPECIES_SLOWKING_GALARIAN - 1] = NATIONAL_DEX_SLOWKING, - [SPECIES_CORSOLA_GALARIAN - 1] = NATIONAL_DEX_CORSOLA, - [SPECIES_ZIGZAGOON_GALARIAN - 1] = NATIONAL_DEX_ZIGZAGOON, - [SPECIES_LINOONE_GALARIAN - 1] = NATIONAL_DEX_LINOONE, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN - 1] = NATIONAL_DEX_DARUMAKA, - [SPECIES_DARMANITAN_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN, - [SPECIES_YAMASK_GALARIAN - 1] = NATIONAL_DEX_YAMASK, - [SPECIES_STUNFISK_GALARIAN - 1] = NATIONAL_DEX_STUNFISK, -#endif -//Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN - 1] = NATIONAL_DEX_GROWLITHE, - [SPECIES_ARCANINE_HISUIAN - 1] = NATIONAL_DEX_ARCANINE, - [SPECIES_VOLTORB_HISUIAN - 1] = NATIONAL_DEX_VOLTORB, - [SPECIES_ELECTRODE_HISUIAN - 1] = NATIONAL_DEX_ELECTRODE, - [SPECIES_TYPHLOSION_HISUIAN - 1] = NATIONAL_DEX_TYPHLOSION, - [SPECIES_QWILFISH_HISUIAN - 1] = NATIONAL_DEX_QWILFISH, - [SPECIES_SNEASEL_HISUIAN - 1] = NATIONAL_DEX_SNEASEL, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_SAMUROTT_HISUIAN - 1] = NATIONAL_DEX_SAMUROTT, - [SPECIES_LILLIGANT_HISUIAN - 1] = NATIONAL_DEX_LILLIGANT, - [SPECIES_ZORUA_HISUIAN - 1] = NATIONAL_DEX_ZORUA, - [SPECIES_ZOROARK_HISUIAN - 1] = NATIONAL_DEX_ZOROARK, - [SPECIES_BRAVIARY_HISUIAN - 1] = NATIONAL_DEX_BRAVIARY, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN - 1] = NATIONAL_DEX_SLIGGOO, - [SPECIES_GOODRA_HISUIAN - 1] = NATIONAL_DEX_GOODRA, - [SPECIES_AVALUGG_HISUIAN - 1] = NATIONAL_DEX_AVALUGG, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE, -#endif - // Cosplay Pikachu - [SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_BELLE - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_POP_STAR - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_PH_D - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_LIBRE - 1] = NATIONAL_DEX_PIKACHU, - // Cap Pikachu - [SPECIES_PIKACHU_ORIGINAL_CAP - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_HOENN_CAP - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_SINNOH_CAP - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_UNOVA_CAP - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_KALOS_CAP - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_ALOLA_CAP - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_PARTNER_CAP - 1] = NATIONAL_DEX_PIKACHU, - [SPECIES_PIKACHU_WORLD_CAP - 1] = NATIONAL_DEX_PIKACHU, -#if P_GEN_4_POKEMON == TRUE - // Origin Forme - [SPECIES_DIALGA_ORIGIN - 1] = NATIONAL_DEX_DIALGA, - [SPECIES_PALKIA_ORIGIN - 1] = NATIONAL_DEX_PALKIA, - // Arceus - [SPECIES_ARCEUS_FAIRY - 1] = NATIONAL_DEX_ARCEUS, -#endif -#if P_GEN_5_POKEMON == TRUE - - [SPECIES_BASCULIN_WHITE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, - // Darmanitan - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE - 1] = NATIONAL_DEX_DARMANITAN, - -#endif -#if P_GEN_6_POKEMON == TRUE - // Greninja - [SPECIES_GRENINJA_BATTLE_BOND - 1] = NATIONAL_DEX_GRENINJA, - [SPECIES_GRENINJA_ASH - 1] = NATIONAL_DEX_GRENINJA, - // Vivillon - [SPECIES_VIVILLON_POLAR - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_TUNDRA - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_CONTINENTAL - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_GARDEN - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_ELEGANT - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_MEADOW - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_MODERN - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_MARINE - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_ARCHIPELAGO - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_HIGH_PLAINS - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_SANDSTORM - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_RIVER - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_MONSOON - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_SAVANNA - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_SUN - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_OCEAN - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_JUNGLE - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_FANCY - 1] = NATIONAL_DEX_VIVILLON, - [SPECIES_VIVILLON_POKE_BALL - 1] = NATIONAL_DEX_VIVILLON, - // Flabébé - [SPECIES_FLABEBE_YELLOW_FLOWER - 1] = NATIONAL_DEX_FLABEBE, - [SPECIES_FLABEBE_ORANGE_FLOWER - 1] = NATIONAL_DEX_FLABEBE, - [SPECIES_FLABEBE_BLUE_FLOWER - 1] = NATIONAL_DEX_FLABEBE, - [SPECIES_FLABEBE_WHITE_FLOWER - 1] = NATIONAL_DEX_FLABEBE, - // Floette - [SPECIES_FLOETTE_YELLOW_FLOWER - 1] = NATIONAL_DEX_FLOETTE, - [SPECIES_FLOETTE_ORANGE_FLOWER - 1] = NATIONAL_DEX_FLOETTE, - [SPECIES_FLOETTE_BLUE_FLOWER - 1] = NATIONAL_DEX_FLOETTE, - [SPECIES_FLOETTE_WHITE_FLOWER - 1] = NATIONAL_DEX_FLOETTE, - [SPECIES_FLOETTE_ETERNAL_FLOWER - 1] = NATIONAL_DEX_FLOETTE, - // Florges - [SPECIES_FLORGES_YELLOW_FLOWER - 1] = NATIONAL_DEX_FLORGES, - [SPECIES_FLORGES_ORANGE_FLOWER - 1] = NATIONAL_DEX_FLORGES, - [SPECIES_FLORGES_BLUE_FLOWER - 1] = NATIONAL_DEX_FLORGES, - [SPECIES_FLORGES_WHITE_FLOWER - 1] = NATIONAL_DEX_FLORGES, - // Furfrou - [SPECIES_FURFROU_HEART_TRIM - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_FURFROU_STAR_TRIM - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_FURFROU_DIAMOND_TRIM - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_FURFROU_DEBUTANTE_TRIM - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_FURFROU_MATRON_TRIM - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_FURFROU_DANDY_TRIM - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_FURFROU_LA_REINE_TRIM - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_FURFROU_KABUKI_TRIM - 1] = NATIONAL_DEX_FURFROU, - [SPECIES_FURFROU_PHARAOH_TRIM - 1] = NATIONAL_DEX_FURFROU, - // Meowstic - [SPECIES_MEOWSTIC_FEMALE - 1] = NATIONAL_DEX_MEOWSTIC, - // Aegislash - [SPECIES_AEGISLASH_BLADE - 1] = NATIONAL_DEX_AEGISLASH, - // Pumpkaboo - [SPECIES_PUMPKABOO_SMALL - 1] = NATIONAL_DEX_PUMPKABOO, - [SPECIES_PUMPKABOO_LARGE - 1] = NATIONAL_DEX_PUMPKABOO, - [SPECIES_PUMPKABOO_SUPER - 1] = NATIONAL_DEX_PUMPKABOO, - // Gourgeist - [SPECIES_GOURGEIST_SMALL - 1] = NATIONAL_DEX_GOURGEIST, - [SPECIES_GOURGEIST_LARGE - 1] = NATIONAL_DEX_GOURGEIST, - [SPECIES_GOURGEIST_SUPER - 1] = NATIONAL_DEX_GOURGEIST, - // Xerneas - [SPECIES_XERNEAS_ACTIVE - 1] = NATIONAL_DEX_XERNEAS, - // Zygarde - [SPECIES_ZYGARDE_10 - 1] = NATIONAL_DEX_ZYGARDE, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT - 1] = NATIONAL_DEX_ZYGARDE, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT - 1] = NATIONAL_DEX_ZYGARDE, - [SPECIES_ZYGARDE_COMPLETE - 1] = NATIONAL_DEX_ZYGARDE, - // Hoopa - [SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA, -#endif -#if P_GEN_7_POKEMON == TRUE - // Oricorio - [SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO, - [SPECIES_ORICORIO_PAU - 1] = NATIONAL_DEX_ORICORIO, - [SPECIES_ORICORIO_SENSU - 1] = NATIONAL_DEX_ORICORIO, - // Rockruff - [SPECIES_ROCKRUFF_OWN_TEMPO - 1] = NATIONAL_DEX_ROCKRUFF, - // Lycanroc - [SPECIES_LYCANROC_MIDNIGHT - 1] = NATIONAL_DEX_LYCANROC, - [SPECIES_LYCANROC_DUSK - 1] = NATIONAL_DEX_LYCANROC, - // Wishiwashi - [SPECIES_WISHIWASHI_SCHOOL - 1] = NATIONAL_DEX_WISHIWASHI, - // Silvally - [SPECIES_SILVALLY_FIGHTING - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_FLYING - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_POISON - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_GROUND - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_ROCK - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_BUG - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_GHOST - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_STEEL - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_FIRE - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_WATER - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_GRASS - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_ELECTRIC - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_PSYCHIC - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_ICE - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_DRAGON - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_DARK - 1] = NATIONAL_DEX_SILVALLY, - [SPECIES_SILVALLY_FAIRY - 1] = NATIONAL_DEX_SILVALLY, - // Minior - [SPECIES_MINIOR_METEOR_ORANGE - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_METEOR_YELLOW - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_METEOR_GREEN - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_METEOR_BLUE - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_METEOR_INDIGO - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_METEOR_VIOLET - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_CORE_RED - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_CORE_ORANGE - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_CORE_YELLOW - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_CORE_GREEN - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_CORE_BLUE - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_CORE_INDIGO - 1] = NATIONAL_DEX_MINIOR, - [SPECIES_MINIOR_CORE_VIOLET - 1] = NATIONAL_DEX_MINIOR, - // Mimikyu - [SPECIES_MIMIKYU_BUSTED - 1] = NATIONAL_DEX_MIMIKYU, - // Necrozma - [SPECIES_NECROZMA_DUSK_MANE - 1] = NATIONAL_DEX_NECROZMA, - [SPECIES_NECROZMA_DAWN_WINGS - 1] = NATIONAL_DEX_NECROZMA, - [SPECIES_NECROZMA_ULTRA - 1] = NATIONAL_DEX_NECROZMA, - // Magearna - [SPECIES_MAGEARNA_ORIGINAL_COLOR - 1] = NATIONAL_DEX_MAGEARNA, -#endif -#if P_GEN_8_POKEMON == TRUE - // Cramorant - [SPECIES_CRAMORANT_GULPING - 1] = NATIONAL_DEX_CRAMORANT, - [SPECIES_CRAMORANT_GORGING - 1] = NATIONAL_DEX_CRAMORANT, - // Toxtricity - [SPECIES_TOXTRICITY_LOW_KEY - 1] = NATIONAL_DEX_TOXTRICITY, - // Sinistea - [SPECIES_SINISTEA_ANTIQUE - 1] = NATIONAL_DEX_SINISTEA, - // Polteageist - [SPECIES_POLTEAGEIST_ANTIQUE - 1] = NATIONAL_DEX_POLTEAGEIST, - // Alcremie - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, - // Eiscue - [SPECIES_EISCUE_NOICE_FACE - 1] = NATIONAL_DEX_EISCUE, - // Indeedee - [SPECIES_INDEEDEE_FEMALE - 1] = NATIONAL_DEX_INDEEDEE, - // Morpeko - [SPECIES_MORPEKO_HANGRY - 1] = NATIONAL_DEX_MORPEKO, - // Zacian - [SPECIES_ZACIAN_CROWNED_SWORD - 1] = NATIONAL_DEX_ZACIAN, - // Zamazenta - [SPECIES_ZAMAZENTA_CROWNED_SHIELD - 1] = NATIONAL_DEX_ZAMAZENTA, - // Eternatus - [SPECIES_ETERNATUS_ETERNAMAX - 1] = NATIONAL_DEX_ETERNATUS, - // Urshifu - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE - 1] = NATIONAL_DEX_URSHIFU, - // Zarude - [SPECIES_ZARUDE_DADA - 1] = NATIONAL_DEX_ZARUDE, - // Calyrex - [SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX, - [SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX, - [SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS, + SPECIES_TO_NATIONAL(ENAMORUS,_THERIAN), #endif }; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 917789fc70..9ebaf64b30 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -30,31 +30,56 @@ const u8 *const gMonIconTable[] = [SPECIES_BULBASAUR] = gMonIcon_Bulbasaur, [SPECIES_IVYSAUR] = gMonIcon_Ivysaur, [SPECIES_VENUSAUR] = gMonIcon_Venusaur, + [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, [SPECIES_CHARMANDER] = gMonIcon_Charmander, [SPECIES_CHARMELEON] = gMonIcon_Charmeleon, [SPECIES_CHARIZARD] = gMonIcon_Charizard, + [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, + [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY, [SPECIES_SQUIRTLE] = gMonIcon_Squirtle, [SPECIES_WARTORTLE] = gMonIcon_Wartortle, [SPECIES_BLASTOISE] = gMonIcon_Blastoise, + [SPECIES_BLASTOISE_MEGA] = gMonIcon_BlastoiseMega, [SPECIES_CATERPIE] = gMonIcon_Caterpie, [SPECIES_METAPOD] = gMonIcon_Metapod, [SPECIES_BUTTERFREE] = gMonIcon_Butterfree, [SPECIES_WEEDLE] = gMonIcon_Weedle, [SPECIES_KAKUNA] = gMonIcon_Kakuna, [SPECIES_BEEDRILL] = gMonIcon_Beedrill, + [SPECIES_BEEDRILL_MEGA] = gMonIcon_BeedrillMega, [SPECIES_PIDGEY] = gMonIcon_Pidgey, [SPECIES_PIDGEOTTO] = gMonIcon_Pidgeotto, [SPECIES_PIDGEOT] = gMonIcon_Pidgeot, + [SPECIES_PIDGEOT_MEGA] = gMonIcon_PidgeotMega, [SPECIES_RATTATA] = gMonIcon_Rattata, + [SPECIES_RATTATA_ALOLAN] = gMonIcon_RattataAlolan, [SPECIES_RATICATE] = gMonIcon_Raticate, + [SPECIES_RATICATE_ALOLAN] = gMonIcon_RaticateAlolan, [SPECIES_SPEAROW] = gMonIcon_Spearow, [SPECIES_FEAROW] = gMonIcon_Fearow, [SPECIES_EKANS] = gMonIcon_Ekans, [SPECIES_ARBOK] = gMonIcon_Arbok, [SPECIES_PIKACHU] = gMonIcon_Pikachu, + [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, + [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, + [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, + [SPECIES_PIKACHU_POP_STAR] = gMonIcon_PikachuPopStar, + [SPECIES_PIKACHU_PH_D] = gMonIcon_PikachuPhD, + [SPECIES_PIKACHU_LIBRE] = gMonIcon_PikachuLibre, + [SPECIES_PIKACHU_ORIGINAL_CAP] = gMonIcon_PikachuOriginalCap, + [SPECIES_PIKACHU_HOENN_CAP] = gMonIcon_PikachuHoennCap, + [SPECIES_PIKACHU_SINNOH_CAP] = gMonIcon_PikachuSinnohCap, + [SPECIES_PIKACHU_UNOVA_CAP] = gMonIcon_PikachuUnovaCap, + [SPECIES_PIKACHU_KALOS_CAP] = gMonIcon_PikachuKalosCap, + [SPECIES_PIKACHU_ALOLA_CAP] = gMonIcon_PikachuAlolaCap, + [SPECIES_PIKACHU_PARTNER_CAP] = gMonIcon_PikachuPartnerCap, + [SPECIES_PIKACHU_WORLD_CAP] = gMonIcon_QuestionMark, [SPECIES_RAICHU] = gMonIcon_Raichu, + [SPECIES_RAICHU_ALOLAN] = gMonIcon_RaichuAlolan, [SPECIES_SANDSHREW] = gMonIcon_Sandshrew, + [SPECIES_SANDSHREW_ALOLAN] = gMonIcon_SandshrewAlolan, [SPECIES_SANDSLASH] = gMonIcon_Sandslash, + [SPECIES_SANDSLASH_ALOLAN] = gMonIcon_SandslashAlolan, [SPECIES_NIDORAN_F] = gMonIcon_NidoranF, [SPECIES_NIDORINA] = gMonIcon_Nidorina, [SPECIES_NIDOQUEEN] = gMonIcon_Nidoqueen, @@ -64,7 +89,9 @@ const u8 *const gMonIconTable[] = [SPECIES_CLEFAIRY] = gMonIcon_Clefairy, [SPECIES_CLEFABLE] = gMonIcon_Clefable, [SPECIES_VULPIX] = gMonIcon_Vulpix, + [SPECIES_VULPIX_ALOLAN] = gMonIcon_VulpixAlolan, [SPECIES_NINETALES] = gMonIcon_Ninetales, + [SPECIES_NINETALES_ALOLAN] = gMonIcon_NinetalesAlolan, [SPECIES_JIGGLYPUFF] = gMonIcon_Jigglypuff, [SPECIES_WIGGLYTUFF] = gMonIcon_Wigglytuff, [SPECIES_ZUBAT] = gMonIcon_Zubat, @@ -77,21 +104,29 @@ const u8 *const gMonIconTable[] = [SPECIES_VENONAT] = gMonIcon_Venonat, [SPECIES_VENOMOTH] = gMonIcon_Venomoth, [SPECIES_DIGLETT] = gMonIcon_Diglett, + [SPECIES_DIGLETT_ALOLAN] = gMonIcon_DiglettAlolan, [SPECIES_DUGTRIO] = gMonIcon_Dugtrio, + [SPECIES_DUGTRIO_ALOLAN] = gMonIcon_DugtrioAlolan, [SPECIES_MEOWTH] = gMonIcon_Meowth, + [SPECIES_MEOWTH_ALOLAN] = gMonIcon_MeowthAlolan, + [SPECIES_MEOWTH_GALARIAN] = gMonIcon_MeowthGalarian, [SPECIES_PERSIAN] = gMonIcon_Persian, + [SPECIES_PERSIAN_ALOLAN] = gMonIcon_PersianAlolan, [SPECIES_PSYDUCK] = gMonIcon_Psyduck, [SPECIES_GOLDUCK] = gMonIcon_Golduck, [SPECIES_MANKEY] = gMonIcon_Mankey, [SPECIES_PRIMEAPE] = gMonIcon_Primeape, [SPECIES_GROWLITHE] = gMonIcon_Growlithe, + [SPECIES_GROWLITHE_HISUIAN] = gMonIcon_GrowlitheHisuian, [SPECIES_ARCANINE] = gMonIcon_Arcanine, + [SPECIES_ARCANINE_HISUIAN] = gMonIcon_ArcanineHisuian, [SPECIES_POLIWAG] = gMonIcon_Poliwag, [SPECIES_POLIWHIRL] = gMonIcon_Poliwhirl, [SPECIES_POLIWRATH] = gMonIcon_Poliwrath, [SPECIES_ABRA] = gMonIcon_Abra, [SPECIES_KADABRA] = gMonIcon_Kadabra, [SPECIES_ALAKAZAM] = gMonIcon_Alakazam, + [SPECIES_ALAKAZAM_MEGA] = gMonIcon_AlakazamMega, [SPECIES_MACHOP] = gMonIcon_Machop, [SPECIES_MACHOKE] = gMonIcon_Machoke, [SPECIES_MACHAMP] = gMonIcon_Machamp, @@ -101,47 +136,65 @@ const u8 *const gMonIconTable[] = [SPECIES_TENTACOOL] = gMonIcon_Tentacool, [SPECIES_TENTACRUEL] = gMonIcon_Tentacruel, [SPECIES_GEODUDE] = gMonIcon_Geodude, + [SPECIES_GEODUDE_ALOLAN] = gMonIcon_GeodudeAlolan, [SPECIES_GRAVELER] = gMonIcon_Graveler, + [SPECIES_GRAVELER_ALOLAN] = gMonIcon_GravelerAlolan, [SPECIES_GOLEM] = gMonIcon_Golem, + [SPECIES_GOLEM_ALOLAN] = gMonIcon_GolemAlolan, [SPECIES_PONYTA] = gMonIcon_Ponyta, + [SPECIES_PONYTA_GALARIAN] = gMonIcon_PonytaGalarian, [SPECIES_RAPIDASH] = gMonIcon_Rapidash, + [SPECIES_RAPIDASH_GALARIAN] = gMonIcon_RapidashGalarian, [SPECIES_SLOWPOKE] = gMonIcon_Slowpoke, + [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_SlowpokeGalarian, [SPECIES_SLOWBRO] = gMonIcon_Slowbro, + [SPECIES_SLOWBRO_MEGA] = gMonIcon_SlowbroMega, + [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_SlowbroGalarian, [SPECIES_MAGNEMITE] = gMonIcon_Magnemite, [SPECIES_MAGNETON] = gMonIcon_Magneton, [SPECIES_FARFETCHD] = gMonIcon_Farfetchd, + [SPECIES_FARFETCHD_GALARIAN] = gMonIcon_FarfetchdGalarian, [SPECIES_DODUO] = gMonIcon_Doduo, [SPECIES_DODRIO] = gMonIcon_Dodrio, [SPECIES_SEEL] = gMonIcon_Seel, [SPECIES_DEWGONG] = gMonIcon_Dewgong, [SPECIES_GRIMER] = gMonIcon_Grimer, + [SPECIES_GRIMER_ALOLAN] = gMonIcon_GrimerAlolan, [SPECIES_MUK] = gMonIcon_Muk, + [SPECIES_MUK_ALOLAN] = gMonIcon_MukAlolan, [SPECIES_SHELLDER] = gMonIcon_Shellder, [SPECIES_CLOYSTER] = gMonIcon_Cloyster, [SPECIES_GASTLY] = gMonIcon_Gastly, [SPECIES_HAUNTER] = gMonIcon_Haunter, [SPECIES_GENGAR] = gMonIcon_Gengar, + [SPECIES_GENGAR_MEGA] = gMonIcon_GengarMega, [SPECIES_ONIX] = gMonIcon_Onix, [SPECIES_DROWZEE] = gMonIcon_Drowzee, [SPECIES_HYPNO] = gMonIcon_Hypno, [SPECIES_KRABBY] = gMonIcon_Krabby, [SPECIES_KINGLER] = gMonIcon_Kingler, [SPECIES_VOLTORB] = gMonIcon_Voltorb, + [SPECIES_VOLTORB_HISUIAN] = gMonIcon_VoltorbHisuian, [SPECIES_ELECTRODE] = gMonIcon_Electrode, + [SPECIES_ELECTRODE_HISUIAN] = gMonIcon_ElectrodeHisuian, [SPECIES_EXEGGCUTE] = gMonIcon_Exeggcute, [SPECIES_EXEGGUTOR] = gMonIcon_Exeggutor, + [SPECIES_EXEGGUTOR_ALOLAN] = gMonIcon_ExeggutorAlolan, [SPECIES_CUBONE] = gMonIcon_Cubone, [SPECIES_MAROWAK] = gMonIcon_Marowak, + [SPECIES_MAROWAK_ALOLAN] = gMonIcon_MarowakAlolan, [SPECIES_HITMONLEE] = gMonIcon_Hitmonlee, [SPECIES_HITMONCHAN] = gMonIcon_Hitmonchan, [SPECIES_LICKITUNG] = gMonIcon_Lickitung, [SPECIES_KOFFING] = gMonIcon_Koffing, [SPECIES_WEEZING] = gMonIcon_Weezing, + [SPECIES_WEEZING_GALARIAN] = gMonIcon_WeezingGalarian, [SPECIES_RHYHORN] = gMonIcon_Rhyhorn, [SPECIES_RHYDON] = gMonIcon_Rhydon, [SPECIES_CHANSEY] = gMonIcon_Chansey, [SPECIES_TANGELA] = gMonIcon_Tangela, [SPECIES_KANGASKHAN] = gMonIcon_Kangaskhan, + [SPECIES_KANGASKHAN_MEGA] = gMonIcon_KangaskhanMega, [SPECIES_HORSEA] = gMonIcon_Horsea, [SPECIES_SEADRA] = gMonIcon_Seadra, [SPECIES_GOLDEEN] = gMonIcon_Goldeen, @@ -149,14 +202,17 @@ const u8 *const gMonIconTable[] = [SPECIES_STARYU] = gMonIcon_Staryu, [SPECIES_STARMIE] = gMonIcon_Starmie, [SPECIES_MR_MIME] = gMonIcon_MrMime, + [SPECIES_MR_MIME_GALARIAN] = gMonIcon_MrMimeGalarian, [SPECIES_SCYTHER] = gMonIcon_Scyther, [SPECIES_JYNX] = gMonIcon_Jynx, [SPECIES_ELECTABUZZ] = gMonIcon_Electabuzz, [SPECIES_MAGMAR] = gMonIcon_Magmar, [SPECIES_PINSIR] = gMonIcon_Pinsir, + [SPECIES_PINSIR_MEGA] = gMonIcon_PinsirMega, [SPECIES_TAUROS] = gMonIcon_Tauros, [SPECIES_MAGIKARP] = gMonIcon_Magikarp, [SPECIES_GYARADOS] = gMonIcon_Gyarados, + [SPECIES_GYARADOS_MEGA] = gMonIcon_GyaradosMega, [SPECIES_LAPRAS] = gMonIcon_Lapras, [SPECIES_DITTO] = gMonIcon_Ditto, [SPECIES_EEVEE] = gMonIcon_Eevee, @@ -169,14 +225,20 @@ const u8 *const gMonIconTable[] = [SPECIES_KABUTO] = gMonIcon_Kabuto, [SPECIES_KABUTOPS] = gMonIcon_Kabutops, [SPECIES_AERODACTYL] = gMonIcon_Aerodactyl, + [SPECIES_AERODACTYL_MEGA] = gMonIcon_AerodactylMega, [SPECIES_SNORLAX] = gMonIcon_Snorlax, [SPECIES_ARTICUNO] = gMonIcon_Articuno, + [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_ArticunoGalarian, [SPECIES_ZAPDOS] = gMonIcon_Zapdos, + [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_ZapdosGalarian, [SPECIES_MOLTRES] = gMonIcon_Moltres, + [SPECIES_MOLTRES_GALARIAN] = gMonIcon_MoltresGalarian, [SPECIES_DRATINI] = gMonIcon_Dratini, [SPECIES_DRAGONAIR] = gMonIcon_Dragonair, [SPECIES_DRAGONITE] = gMonIcon_Dragonite, [SPECIES_MEWTWO] = gMonIcon_Mewtwo, + [SPECIES_MEWTWO_MEGA_X] = gMonIcon_MewtwoMegaX, + [SPECIES_MEWTWO_MEGA_Y] = gMonIcon_MewtwoMegaY, [SPECIES_MEW] = gMonIcon_Mew, [SPECIES_CHIKORITA] = gMonIcon_Chikorita, [SPECIES_BAYLEEF] = gMonIcon_Bayleef, @@ -184,6 +246,7 @@ const u8 *const gMonIconTable[] = [SPECIES_CYNDAQUIL] = gMonIcon_Cyndaquil, [SPECIES_QUILAVA] = gMonIcon_Quilava, [SPECIES_TYPHLOSION] = gMonIcon_Typhlosion, + [SPECIES_TYPHLOSION_HISUIAN] = gMonIcon_TyphlosionHisuian, [SPECIES_TOTODILE] = gMonIcon_Totodile, [SPECIES_CROCONAW] = gMonIcon_Croconaw, [SPECIES_FERALIGATR] = gMonIcon_Feraligatr, @@ -199,6 +262,7 @@ const u8 *const gMonIconTable[] = [SPECIES_CHINCHOU] = gMonIcon_Chinchou, [SPECIES_LANTURN] = gMonIcon_Lanturn, [SPECIES_PICHU] = gMonIcon_Pichu, + [SPECIES_PICHU_SPIKY_EARED] = gMonIcon_PichuSpikyEared, [SPECIES_CLEFFA] = gMonIcon_Cleffa, [SPECIES_IGGLYBUFF] = gMonIcon_Igglybuff, [SPECIES_TOGEPI] = gMonIcon_Togepi, @@ -208,6 +272,7 @@ const u8 *const gMonIconTable[] = [SPECIES_MAREEP] = gMonIcon_Mareep, [SPECIES_FLAAFFY] = gMonIcon_Flaaffy, [SPECIES_AMPHAROS] = gMonIcon_Ampharos, + [SPECIES_AMPHAROS_MEGA] = gMonIcon_AmpharosMega, [SPECIES_BELLOSSOM] = gMonIcon_Bellossom, [SPECIES_MARILL] = gMonIcon_Marill, [SPECIES_AZUMARILL] = gMonIcon_Azumarill, @@ -226,6 +291,7 @@ const u8 *const gMonIconTable[] = [SPECIES_UMBREON] = gMonIcon_Umbreon, [SPECIES_MURKROW] = gMonIcon_Murkrow, [SPECIES_SLOWKING] = gMonIcon_Slowking, + [SPECIES_SLOWKING_GALARIAN] = gMonIcon_SlowkingGalarian, [SPECIES_MISDREAVUS] = gMonIcon_Misdreavus, [SPECIES_UNOWN] = gMonIcon_Unown, [SPECIES_UNOWN_B] = gMonIcon_UnownB, @@ -262,13 +328,18 @@ const u8 *const gMonIconTable[] = [SPECIES_DUNSPARCE] = gMonIcon_Dunsparce, [SPECIES_GLIGAR] = gMonIcon_Gligar, [SPECIES_STEELIX] = gMonIcon_Steelix, + [SPECIES_STEELIX_MEGA] = gMonIcon_SteelixMega, [SPECIES_SNUBBULL] = gMonIcon_Snubbull, [SPECIES_GRANBULL] = gMonIcon_Granbull, [SPECIES_QWILFISH] = gMonIcon_Qwilfish, + [SPECIES_QWILFISH_HISUIAN] = gMonIcon_QwilfishHisuian, [SPECIES_SCIZOR] = gMonIcon_Scizor, + [SPECIES_SCIZOR_MEGA] = gMonIcon_ScizorMega, [SPECIES_SHUCKLE] = gMonIcon_Shuckle, [SPECIES_HERACROSS] = gMonIcon_Heracross, + [SPECIES_HERACROSS_MEGA] = gMonIcon_HeracrossMega, [SPECIES_SNEASEL] = gMonIcon_Sneasel, + [SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian, [SPECIES_TEDDIURSA] = gMonIcon_Teddiursa, [SPECIES_URSARING] = gMonIcon_Ursaring, [SPECIES_SLUGMA] = gMonIcon_Slugma, @@ -276,6 +347,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SWINUB] = gMonIcon_Swinub, [SPECIES_PILOSWINE] = gMonIcon_Piloswine, [SPECIES_CORSOLA] = gMonIcon_Corsola, + [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian, [SPECIES_REMORAID] = gMonIcon_Remoraid, [SPECIES_OCTILLERY] = gMonIcon_Octillery, [SPECIES_DELIBIRD] = gMonIcon_Delibird, @@ -283,6 +355,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SKARMORY] = gMonIcon_Skarmory, [SPECIES_HOUNDOUR] = gMonIcon_Houndour, [SPECIES_HOUNDOOM] = gMonIcon_Houndoom, + [SPECIES_HOUNDOOM_MEGA] = gMonIcon_HoundoomMega, [SPECIES_KINGDRA] = gMonIcon_Kingdra, [SPECIES_PHANPY] = gMonIcon_Phanpy, [SPECIES_DONPHAN] = gMonIcon_Donphan, @@ -302,22 +375,28 @@ const u8 *const gMonIconTable[] = [SPECIES_LARVITAR] = gMonIcon_Larvitar, [SPECIES_PUPITAR] = gMonIcon_Pupitar, [SPECIES_TYRANITAR] = gMonIcon_Tyranitar, + [SPECIES_TYRANITAR_MEGA] = gMonIcon_TyranitarMega, [SPECIES_LUGIA] = gMonIcon_Lugia, [SPECIES_HO_OH] = gMonIcon_HoOh, [SPECIES_CELEBI] = gMonIcon_Celebi, [SPECIES_TREECKO] = gMonIcon_Treecko, [SPECIES_GROVYLE] = gMonIcon_Grovyle, [SPECIES_SCEPTILE] = gMonIcon_Sceptile, + [SPECIES_SCEPTILE_MEGA] = gMonIcon_SceptileMega, [SPECIES_TORCHIC] = gMonIcon_Torchic, [SPECIES_COMBUSKEN] = gMonIcon_Combusken, [SPECIES_BLAZIKEN] = gMonIcon_Blaziken, + [SPECIES_BLAZIKEN_MEGA] = gMonIcon_BlazikenMega, [SPECIES_MUDKIP] = gMonIcon_Mudkip, [SPECIES_MARSHTOMP] = gMonIcon_Marshtomp, [SPECIES_SWAMPERT] = gMonIcon_Swampert, + [SPECIES_SWAMPERT_MEGA] = gMonIcon_SwampertMega, [SPECIES_POOCHYENA] = gMonIcon_Poochyena, [SPECIES_MIGHTYENA] = gMonIcon_Mightyena, [SPECIES_ZIGZAGOON] = gMonIcon_Zigzagoon, + [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian, [SPECIES_LINOONE] = gMonIcon_Linoone, + [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, [SPECIES_WURMPLE] = gMonIcon_Wurmple, [SPECIES_SILCOON] = gMonIcon_Silcoon, [SPECIES_BEAUTIFLY] = gMonIcon_Beautifly, @@ -336,6 +415,7 @@ const u8 *const gMonIconTable[] = [SPECIES_RALTS] = gMonIcon_Ralts, [SPECIES_KIRLIA] = gMonIcon_Kirlia, [SPECIES_GARDEVOIR] = gMonIcon_Gardevoir, + [SPECIES_GARDEVOIR_MEGA] = gMonIcon_GardevoirMega, [SPECIES_SURSKIT] = gMonIcon_Surskit, [SPECIES_MASQUERAIN] = gMonIcon_Masquerain, [SPECIES_SHROOMISH] = gMonIcon_Shroomish, @@ -356,14 +436,19 @@ const u8 *const gMonIconTable[] = [SPECIES_SKITTY] = gMonIcon_Skitty, [SPECIES_DELCATTY] = gMonIcon_Delcatty, [SPECIES_SABLEYE] = gMonIcon_Sableye, + [SPECIES_SABLEYE_MEGA] = gMonIcon_SableyeMega, [SPECIES_MAWILE] = gMonIcon_Mawile, + [SPECIES_MAWILE_MEGA] = gMonIcon_MawileMega, [SPECIES_ARON] = gMonIcon_Aron, [SPECIES_LAIRON] = gMonIcon_Lairon, [SPECIES_AGGRON] = gMonIcon_Aggron, + [SPECIES_AGGRON_MEGA] = gMonIcon_AggronMega, [SPECIES_MEDITITE] = gMonIcon_Meditite, [SPECIES_MEDICHAM] = gMonIcon_Medicham, + [SPECIES_MEDICHAM_MEGA] = gMonIcon_MedichamMega, [SPECIES_ELECTRIKE] = gMonIcon_Electrike, [SPECIES_MANECTRIC] = gMonIcon_Manectric, + [SPECIES_MANECTRIC_MEGA] = gMonIcon_ManectricMega, [SPECIES_PLUSLE] = gMonIcon_Plusle, [SPECIES_MINUN] = gMonIcon_Minun, [SPECIES_VOLBEAT] = gMonIcon_Volbeat, @@ -373,10 +458,12 @@ const u8 *const gMonIconTable[] = [SPECIES_SWALOT] = gMonIcon_Swalot, [SPECIES_CARVANHA] = gMonIcon_Carvanha, [SPECIES_SHARPEDO] = gMonIcon_Sharpedo, + [SPECIES_SHARPEDO_MEGA] = gMonIcon_SharpedoMega, [SPECIES_WAILMER] = gMonIcon_Wailmer, [SPECIES_WAILORD] = gMonIcon_Wailord, [SPECIES_NUMEL] = gMonIcon_Numel, [SPECIES_CAMERUPT] = gMonIcon_Camerupt, + [SPECIES_CAMERUPT_MEGA] = gMonIcon_CameruptMega, [SPECIES_TORKOAL] = gMonIcon_Torkoal, [SPECIES_SPOINK] = gMonIcon_Spoink, [SPECIES_GRUMPIG] = gMonIcon_Grumpig, @@ -388,6 +475,7 @@ const u8 *const gMonIconTable[] = [SPECIES_CACTURNE] = gMonIcon_Cacturne, [SPECIES_SWABLU] = gMonIcon_Swablu, [SPECIES_ALTARIA] = gMonIcon_Altaria, + [SPECIES_ALTARIA_MEGA] = gMonIcon_AltariaMega, [SPECIES_ZANGOOSE] = gMonIcon_Zangoose, [SPECIES_SEVIPER] = gMonIcon_Seviper, [SPECIES_LUNATONE] = gMonIcon_Lunatone, @@ -411,14 +499,17 @@ const u8 *const gMonIconTable[] = [SPECIES_KECLEON] = gMonIcon_Kecleon, [SPECIES_SHUPPET] = gMonIcon_Shuppet, [SPECIES_BANETTE] = gMonIcon_Banette, + [SPECIES_BANETTE_MEGA] = gMonIcon_BanetteMega, [SPECIES_DUSKULL] = gMonIcon_Duskull, [SPECIES_DUSCLOPS] = gMonIcon_Dusclops, [SPECIES_TROPIUS] = gMonIcon_Tropius, [SPECIES_CHIMECHO] = gMonIcon_Chimecho, [SPECIES_ABSOL] = gMonIcon_Absol, + [SPECIES_ABSOL_MEGA] = gMonIcon_AbsolMega, [SPECIES_WYNAUT] = gMonIcon_Wynaut, [SPECIES_SNORUNT] = gMonIcon_Snorunt, [SPECIES_GLALIE] = gMonIcon_Glalie, + [SPECIES_GLALIE_MEGA] = gMonIcon_GlalieMega, [SPECIES_SPHEAL] = gMonIcon_Spheal, [SPECIES_SEALEO] = gMonIcon_Sealeo, [SPECIES_WALREIN] = gMonIcon_Walrein, @@ -430,17 +521,24 @@ const u8 *const gMonIconTable[] = [SPECIES_BAGON] = gMonIcon_Bagon, [SPECIES_SHELGON] = gMonIcon_Shelgon, [SPECIES_SALAMENCE] = gMonIcon_Salamence, + [SPECIES_SALAMENCE_MEGA] = gMonIcon_SalamenceMega, [SPECIES_BELDUM] = gMonIcon_Beldum, [SPECIES_METANG] = gMonIcon_Metang, [SPECIES_METAGROSS] = gMonIcon_Metagross, + [SPECIES_METAGROSS_MEGA] = gMonIcon_MetagrossMega, [SPECIES_REGIROCK] = gMonIcon_Regirock, [SPECIES_REGICE] = gMonIcon_Regice, [SPECIES_REGISTEEL] = gMonIcon_Registeel, [SPECIES_LATIAS] = gMonIcon_Latias, + [SPECIES_LATIAS_MEGA] = gMonIcon_LatiasMega, [SPECIES_LATIOS] = gMonIcon_Latios, + [SPECIES_LATIOS_MEGA] = gMonIcon_LatiosMega, [SPECIES_KYOGRE] = gMonIcon_Kyogre, + [SPECIES_KYOGRE_PRIMAL] = gMonIcon_KyogrePrimal, [SPECIES_GROUDON] = gMonIcon_Groudon, + [SPECIES_GROUDON_PRIMAL] = gMonIcon_GroudonPrimal, [SPECIES_RAYQUAZA] = gMonIcon_Rayquaza, + [SPECIES_RAYQUAZA_MEGA] = gMonIcon_RayquazaMega, [SPECIES_JIRACHI] = gMonIcon_Jirachi, [SPECIES_DEOXYS_NORMAL] = gMonIcon_DeoxysNormal, [SPECIES_DEOXYS_ATTACK] = gMonIcon_DeoxysAttack, @@ -490,13 +588,14 @@ const u8 *const gMonIconTable[] = [SPECIES_CHERRIM_SUNSHINE] = gMonIcon_CherrimSunshine, [SPECIES_SHELLOS_WEST_SEA] = gMonIcon_ShellosWestSea, [SPECIES_SHELLOS_EAST_SEA] = gMonIcon_ShellosEastSea, - [SPECIES_GASTRODON] = gMonIcon_Gastrodon, + [SPECIES_GASTRODON_WEST_SEA] = gMonIcon_Gastrodon, [SPECIES_GASTRODON_EAST_SEA] = gMonIcon_GastrodonEastSea, [SPECIES_AMBIPOM] = gMonIcon_Ambipom, [SPECIES_DRIFLOON] = gMonIcon_Drifloon, [SPECIES_DRIFBLIM] = gMonIcon_Drifblim, [SPECIES_BUNEARY] = gMonIcon_Buneary, [SPECIES_LOPUNNY] = gMonIcon_Lopunny, + [SPECIES_LOPUNNY_MEGA] = gMonIcon_LopunnyMega, [SPECIES_MISMAGIUS] = gMonIcon_Mismagius, [SPECIES_HONCHKROW] = gMonIcon_Honchkrow, [SPECIES_GLAMEOW] = gMonIcon_Glameow, @@ -514,9 +613,11 @@ const u8 *const gMonIconTable[] = [SPECIES_GIBLE] = gMonIcon_Gible, [SPECIES_GABITE] = gMonIcon_Gabite, [SPECIES_GARCHOMP] = gMonIcon_Garchomp, + [SPECIES_GARCHOMP_MEGA] = gMonIcon_GarchompMega, [SPECIES_MUNCHLAX] = gMonIcon_Munchlax, [SPECIES_RIOLU] = gMonIcon_Riolu, [SPECIES_LUCARIO] = gMonIcon_Lucario, + [SPECIES_LUCARIO_MEGA] = gMonIcon_LucarioMega, [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, [SPECIES_SKORUPI] = gMonIcon_Skorupi, @@ -529,6 +630,7 @@ const u8 *const gMonIconTable[] = [SPECIES_MANTYKE] = gMonIcon_Mantyke, [SPECIES_SNOVER] = gMonIcon_Snover, [SPECIES_ABOMASNOW] = gMonIcon_Abomasnow, + [SPECIES_ABOMASNOW_MEGA] = gMonIcon_AbomasnowMega, [SPECIES_WEAVILE] = gMonIcon_Weavile, [SPECIES_MAGNEZONE] = gMonIcon_Magnezone, [SPECIES_LICKILICKY] = gMonIcon_Lickilicky, @@ -544,23 +646,33 @@ const u8 *const gMonIconTable[] = [SPECIES_MAMOSWINE] = gMonIcon_Mamoswine, [SPECIES_PORYGON_Z] = gMonIcon_Porygon_Z, [SPECIES_GALLADE] = gMonIcon_Gallade, + [SPECIES_GALLADE_MEGA] = gMonIcon_GalladeMega, [SPECIES_PROBOPASS] = gMonIcon_Probopass, [SPECIES_DUSKNOIR] = gMonIcon_Dusknoir, [SPECIES_FROSLASS] = gMonIcon_Froslass, [SPECIES_ROTOM] = gMonIcon_Rotom, + [SPECIES_ROTOM_HEAT] = gMonIcon_RotomHeat, + [SPECIES_ROTOM_WASH] = gMonIcon_RotomWash, + [SPECIES_ROTOM_FROST] = gMonIcon_RotomFrost, + [SPECIES_ROTOM_FAN] = gMonIcon_RotomFan, + [SPECIES_ROTOM_MOW] = gMonIcon_RotomMow, [SPECIES_UXIE] = gMonIcon_Uxie, [SPECIES_MESPRIT] = gMonIcon_Mesprit, [SPECIES_AZELF] = gMonIcon_Azelf, [SPECIES_DIALGA] = gMonIcon_Dialga, + [SPECIES_DIALGA_ORIGIN] = gMonIcon_DialgaOrigin, [SPECIES_PALKIA] = gMonIcon_Palkia, + [SPECIES_PALKIA_ORIGIN] = gMonIcon_PalkiaOrigin, [SPECIES_HEATRAN] = gMonIcon_Heatran, [SPECIES_REGIGIGAS] = gMonIcon_Regigigas, [SPECIES_GIRATINA_ALTERED] = gMonIcon_Giratina, + [SPECIES_GIRATINA_ORIGIN] = gMonIcon_GiratinaOrigin, [SPECIES_CRESSELIA] = gMonIcon_Cresselia, [SPECIES_PHIONE] = gMonIcon_Phione, [SPECIES_MANAPHY] = gMonIcon_Manaphy, [SPECIES_DARKRAI] = gMonIcon_Darkrai, [SPECIES_SHAYMIN_LAND] = gMonIcon_Shaymin, + [SPECIES_SHAYMIN_SKY] = gMonIcon_ShayminSky, [SPECIES_ARCEUS_NORMAL] = gMonIcon_Arceus, [SPECIES_ARCEUS_FIGHTING] = gMonIcon_Arceus, [SPECIES_ARCEUS_FLYING] = gMonIcon_Arceus, @@ -578,18 +690,8 @@ const u8 *const gMonIconTable[] = [SPECIES_ARCEUS_ICE] = gMonIcon_Arceus, [SPECIES_ARCEUS_DRAGON] = gMonIcon_Arceus, [SPECIES_ARCEUS_DARK] = gMonIcon_Arceus, -// Platinum - [SPECIES_ROTOM_HEAT] = gMonIcon_RotomHeat, - [SPECIES_ROTOM_WASH] = gMonIcon_RotomWash, - [SPECIES_ROTOM_FROST] = gMonIcon_RotomFrost, - [SPECIES_ROTOM_FAN] = gMonIcon_RotomFan, - [SPECIES_ROTOM_MOW] = gMonIcon_RotomMow, - [SPECIES_GIRATINA_ORIGIN] = gMonIcon_GiratinaOrigin, - [SPECIES_SHAYMIN_SKY] = gMonIcon_ShayminSky, + [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, #endif -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = gMonIcon_PichuSpikyEared, - #if P_GEN_5_POKEMON == TRUE // Black and White [SPECIES_VICTINI] = gMonIcon_Victini, @@ -602,6 +704,7 @@ const u8 *const gMonIconTable[] = [SPECIES_OSHAWOTT] = gMonIcon_Oshawott, [SPECIES_DEWOTT] = gMonIcon_Dewott, [SPECIES_SAMUROTT] = gMonIcon_Samurott, + [SPECIES_SAMUROTT_HISUIAN] = gMonIcon_SamurottHisuian, [SPECIES_PATRAT] = gMonIcon_Patrat, [SPECIES_WATCHOG] = gMonIcon_Watchog, [SPECIES_LILLIPUP] = gMonIcon_Lillipup, @@ -630,6 +733,7 @@ const u8 *const gMonIconTable[] = [SPECIES_DRILBUR] = gMonIcon_Drilbur, [SPECIES_EXCADRILL] = gMonIcon_Excadrill, [SPECIES_AUDINO] = gMonIcon_Audino, + [SPECIES_AUDINO_MEGA] = gMonIcon_AudinoMega, [SPECIES_TIMBURR] = gMonIcon_Timburr, [SPECIES_GURDURR] = gMonIcon_Gurdurr, [SPECIES_CONKELDURR] = gMonIcon_Conkeldurr, @@ -648,14 +752,19 @@ const u8 *const gMonIconTable[] = [SPECIES_WHIMSICOTT] = gMonIcon_Whimsicott, [SPECIES_PETILIL] = gMonIcon_Petilil, [SPECIES_LILLIGANT] = gMonIcon_Lilligant, + [SPECIES_LILLIGANT_HISUIAN] = gMonIcon_LilligantHisuian, [SPECIES_BASCULIN_RED_STRIPED] = gMonIcon_Basculin, [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped, + [SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped, [SPECIES_SANDILE] = gMonIcon_Sandile, [SPECIES_KROKOROK] = gMonIcon_Krokorok, [SPECIES_KROOKODILE] = gMonIcon_Krookodile, [SPECIES_DARUMAKA] = gMonIcon_Darumaka, - [SPECIES_DARMANITAN] = gMonIcon_Darmanitan, + [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, + [SPECIES_DARMANITAN_STANDARD_MODE] = gMonIcon_Darmanitan, [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = gMonIcon_DarmanitanGalarian, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = gMonIcon_DarmanitanGalarianZenMode, [SPECIES_MARACTUS] = gMonIcon_Maractus, [SPECIES_DWEBBLE] = gMonIcon_Dwebble, [SPECIES_CRUSTLE] = gMonIcon_Crustle, @@ -663,6 +772,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SCRAFTY] = gMonIcon_Scrafty, [SPECIES_SIGILYPH] = gMonIcon_Sigilyph, [SPECIES_YAMASK] = gMonIcon_Yamask, + [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, [SPECIES_COFAGRIGUS] = gMonIcon_Cofagrigus, [SPECIES_TIRTOUGA] = gMonIcon_Tirtouga, [SPECIES_CARRACOSTA] = gMonIcon_Carracosta, @@ -671,7 +781,9 @@ const u8 *const gMonIconTable[] = [SPECIES_TRUBBISH] = gMonIcon_Trubbish, [SPECIES_GARBODOR] = gMonIcon_Garbodor, [SPECIES_ZORUA] = gMonIcon_Zorua, + [SPECIES_ZORUA_HISUIAN] = gMonIcon_ZoruaHisuian, [SPECIES_ZOROARK] = gMonIcon_Zoroark, + [SPECIES_ZOROARK_HISUIAN] = gMonIcon_ZoroarkHisuian, [SPECIES_MINCCINO] = gMonIcon_Minccino, [SPECIES_CINCCINO] = gMonIcon_Cinccino, [SPECIES_GOTHITA] = gMonIcon_Gothita, @@ -685,11 +797,11 @@ const u8 *const gMonIconTable[] = [SPECIES_VANILLITE] = gMonIcon_Vanillite, [SPECIES_VANILLISH] = gMonIcon_Vanillish, [SPECIES_VANILLUXE] = gMonIcon_Vanilluxe, - [SPECIES_DEERLING] = gMonIcon_Deerling, + [SPECIES_DEERLING_SPRING] = gMonIcon_Deerling, [SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer, [SPECIES_DEERLING_AUTUMN] = gMonIcon_DeerlingAutumn, [SPECIES_DEERLING_WINTER] = gMonIcon_DeerlingWinter, - [SPECIES_SAWSBUCK] = gMonIcon_Sawsbuck, + [SPECIES_SAWSBUCK_SPRING] = gMonIcon_Sawsbuck, [SPECIES_SAWSBUCK_SUMMER] = gMonIcon_SawsbuckSummer, [SPECIES_SAWSBUCK_AUTUMN] = gMonIcon_SawsbuckAutumn, [SPECIES_SAWSBUCK_WINTER] = gMonIcon_SawsbuckWinter, @@ -725,6 +837,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SHELMET] = gMonIcon_Shelmet, [SPECIES_ACCELGOR] = gMonIcon_Accelgor, [SPECIES_STUNFISK] = gMonIcon_Stunfisk, + [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, [SPECIES_MIENFOO] = gMonIcon_Mienfoo, [SPECIES_MIENSHAO] = gMonIcon_Mienshao, [SPECIES_DRUDDIGON] = gMonIcon_Druddigon, @@ -735,6 +848,7 @@ const u8 *const gMonIconTable[] = [SPECIES_BOUFFALANT] = gMonIcon_Bouffalant, [SPECIES_RUFFLET] = gMonIcon_Rufflet, [SPECIES_BRAVIARY] = gMonIcon_Braviary, + [SPECIES_BRAVIARY_HISUIAN] = gMonIcon_BraviaryHisuian, [SPECIES_VULLABY] = gMonIcon_Vullaby, [SPECIES_MANDIBUZZ] = gMonIcon_Mandibuzz, [SPECIES_HEATMOR] = gMonIcon_Heatmor, @@ -747,21 +861,20 @@ const u8 *const gMonIconTable[] = [SPECIES_COBALION] = gMonIcon_Cobalion, [SPECIES_TERRAKION] = gMonIcon_Terrakion, [SPECIES_VIRIZION] = gMonIcon_Virizion, - [SPECIES_TORNADUS] = gMonIcon_Tornadus, - [SPECIES_THUNDURUS] = gMonIcon_Thundurus, + [SPECIES_TORNADUS_INCARNATE] = gMonIcon_Tornadus, + [SPECIES_THUNDURUS_INCARNATE] = gMonIcon_Thundurus, [SPECIES_RESHIRAM] = gMonIcon_Reshiram, [SPECIES_ZEKROM] = gMonIcon_Zekrom, - [SPECIES_LANDORUS] = gMonIcon_Landorus, + [SPECIES_LANDORUS_INCARNATE] = gMonIcon_Landorus, [SPECIES_KYUREM] = gMonIcon_Kyurem, - [SPECIES_KELDEO] = gMonIcon_Keldeo, - [SPECIES_MELOETTA] = gMonIcon_Meloetta, + [SPECIES_KELDEO_ORDINARY] = gMonIcon_Keldeo, + [SPECIES_MELOETTA_ARIA] = gMonIcon_Meloetta, [SPECIES_MELOETTA_PIROUETTE] = gMonIcon_MeloettaPirouette, [SPECIES_GENESECT] = gMonIcon_Genesect, [SPECIES_GENESECT_DOUSE_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_SHOCK_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_BURN_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_CHILL_DRIVE] = gMonIcon_Genesect, -// Black 2 and White 2 [SPECIES_TORNADUS_THERIAN] = gMonIcon_TornadusTherian, [SPECIES_THUNDURUS_THERIAN] = gMonIcon_ThundurusTherian, [SPECIES_LANDORUS_THERIAN] = gMonIcon_LandorusTherian, @@ -770,7 +883,6 @@ const u8 *const gMonIconTable[] = [SPECIES_KELDEO_RESOLUTE] = gMonIcon_KeldeoResolute, #endif #if P_GEN_6_POKEMON == TRUE -// X and Y [SPECIES_CHESPIN] = gMonIcon_Chespin, [SPECIES_QUILLADIN] = gMonIcon_Quilladin, [SPECIES_CHESNAUGHT] = gMonIcon_Chesnaught, @@ -780,6 +892,8 @@ const u8 *const gMonIconTable[] = [SPECIES_FROAKIE] = gMonIcon_Froakie, [SPECIES_FROGADIER] = gMonIcon_Frogadier, [SPECIES_GRENINJA] = gMonIcon_Greninja, + [SPECIES_GRENINJA_BATTLE_BOND] = gMonIcon_Greninja, + [SPECIES_GRENINJA_ASH] = gMonIcon_GreninjaAsh, [SPECIES_BUNNELBY] = gMonIcon_Bunnelby, [SPECIES_DIGGERSBY] = gMonIcon_Diggersby, [SPECIES_FLETCHLING] = gMonIcon_Fletchling, @@ -787,7 +901,7 @@ const u8 *const gMonIconTable[] = [SPECIES_TALONFLAME] = gMonIcon_Talonflame, [SPECIES_SCATTERBUG] = gMonIcon_Scatterbug, [SPECIES_SPEWPA] = gMonIcon_Spewpa, - [SPECIES_VIVILLON] = gMonIcon_Vivillon, + [SPECIES_VIVILLON_ICY_SNOW] = gMonIcon_Vivillon, [SPECIES_VIVILLON_POLAR] = gMonIcon_VivillonPolar, [SPECIES_VIVILLON_TUNDRA] = gMonIcon_VivillonTundra, [SPECIES_VIVILLON_CONTINENTAL] = gMonIcon_VivillonContinental, @@ -809,18 +923,18 @@ const u8 *const gMonIconTable[] = [SPECIES_VIVILLON_POKE_BALL] = gMonIcon_VivillonPokeBall, [SPECIES_LITLEO] = gMonIcon_Litleo, [SPECIES_PYROAR] = gMonIcon_Pyroar, - [SPECIES_FLABEBE] = gMonIcon_Flabebe, + [SPECIES_FLABEBE_RED_FLOWER] = gMonIcon_Flabebe, [SPECIES_FLABEBE_YELLOW_FLOWER] = gMonIcon_FlabebeYellowFlower, [SPECIES_FLABEBE_ORANGE_FLOWER] = gMonIcon_FlabebeOrangeFlower, [SPECIES_FLABEBE_BLUE_FLOWER] = gMonIcon_FlabebeBlueFlower, [SPECIES_FLABEBE_WHITE_FLOWER] = gMonIcon_FlabebeWhiteFlower, - [SPECIES_FLOETTE] = gMonIcon_Floette, + [SPECIES_FLOETTE_RED_FLOWER] = gMonIcon_Floette, [SPECIES_FLOETTE_YELLOW_FLOWER] = gMonIcon_FloetteYellowFlower, [SPECIES_FLOETTE_ORANGE_FLOWER] = gMonIcon_FloetteOrangeFlower, [SPECIES_FLOETTE_BLUE_FLOWER] = gMonIcon_FloetteBlueFlower, [SPECIES_FLOETTE_WHITE_FLOWER] = gMonIcon_FloetteWhiteFlower, [SPECIES_FLOETTE_ETERNAL_FLOWER] = gMonIcon_FloetteEternalFlower, - [SPECIES_FLORGES] = gMonIcon_Florges, + [SPECIES_FLORGES_RED_FLOWER] = gMonIcon_Florges, [SPECIES_FLORGES_YELLOW_FLOWER] = gMonIcon_FlorgesYellowFlower, [SPECIES_FLORGES_ORANGE_FLOWER] = gMonIcon_FlorgesOrangeFlower, [SPECIES_FLORGES_BLUE_FLOWER] = gMonIcon_FlorgesBlueFlower, @@ -829,7 +943,7 @@ const u8 *const gMonIconTable[] = [SPECIES_GOGOAT] = gMonIcon_Gogoat, [SPECIES_PANCHAM] = gMonIcon_Pancham, [SPECIES_PANGORO] = gMonIcon_Pangoro, - [SPECIES_FURFROU] = gMonIcon_Furfrou, + [SPECIES_FURFROU_NATURAL] = gMonIcon_Furfrou, [SPECIES_FURFROU_HEART_TRIM] = gMonIcon_FurfrouHeartTrim, [SPECIES_FURFROU_STAR_TRIM] = gMonIcon_FurfrouStarTrim, [SPECIES_FURFROU_DIAMOND_TRIM] = gMonIcon_FurfrouDiamondTrim, @@ -840,11 +954,11 @@ const u8 *const gMonIconTable[] = [SPECIES_FURFROU_KABUKI_TRIM] = gMonIcon_FurfrouKabukiTrim, [SPECIES_FURFROU_PHARAOH_TRIM] = gMonIcon_FurfrouPharaohTrim, [SPECIES_ESPURR] = gMonIcon_Espurr, - [SPECIES_MEOWSTIC] = gMonIcon_Meowstic, + [SPECIES_MEOWSTIC_MALE] = gMonIcon_Meowstic, [SPECIES_MEOWSTIC_FEMALE] = gMonIcon_MeowsticFemale, [SPECIES_HONEDGE] = gMonIcon_Honedge, [SPECIES_DOUBLADE] = gMonIcon_Doublade, - [SPECIES_AEGISLASH] = gMonIcon_Aegislash, + [SPECIES_AEGISLASH_SHIELD] = gMonIcon_Aegislash, [SPECIES_AEGISLASH_BLADE] = gMonIcon_AegislashBlade, [SPECIES_SPRITZEE] = gMonIcon_Spritzee, [SPECIES_AROMATISSE] = gMonIcon_Aromatisse, @@ -870,103 +984,44 @@ const u8 *const gMonIconTable[] = [SPECIES_CARBINK] = gMonIcon_Carbink, [SPECIES_GOOMY] = gMonIcon_Goomy, [SPECIES_SLIGGOO] = gMonIcon_Sliggoo, + [SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian, [SPECIES_GOODRA] = gMonIcon_Goodra, + [SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian, [SPECIES_KLEFKI] = gMonIcon_Klefki, [SPECIES_PHANTUMP] = gMonIcon_Phantump, [SPECIES_TREVENANT] = gMonIcon_Trevenant, - [SPECIES_PUMPKABOO] = gMonIcon_Pumpkaboo, + [SPECIES_PUMPKABOO_AVERAGE] = gMonIcon_Pumpkaboo, [SPECIES_PUMPKABOO_SMALL] = gMonIcon_Pumpkaboo, [SPECIES_PUMPKABOO_LARGE] = gMonIcon_Pumpkaboo, [SPECIES_PUMPKABOO_SUPER] = gMonIcon_Pumpkaboo, - [SPECIES_GOURGEIST] = gMonIcon_Gourgeist, + [SPECIES_GOURGEIST_AVERAGE] = gMonIcon_Gourgeist, [SPECIES_GOURGEIST_SMALL] = gMonIcon_Gourgeist, [SPECIES_GOURGEIST_LARGE] = gMonIcon_Gourgeist, [SPECIES_GOURGEIST_SUPER] = gMonIcon_Gourgeist, [SPECIES_BERGMITE] = gMonIcon_Bergmite, [SPECIES_AVALUGG] = gMonIcon_Avalugg, + [SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian, [SPECIES_NOIBAT] = gMonIcon_Noibat, [SPECIES_NOIVERN] = gMonIcon_Noivern, - [SPECIES_XERNEAS] = gMonIcon_Xerneas, + [SPECIES_XERNEAS_NEUTRAL] = gMonIcon_Xerneas, [SPECIES_XERNEAS_ACTIVE] = gMonIcon_XerneasActive, [SPECIES_YVELTAL] = gMonIcon_Yveltal, - [SPECIES_ZYGARDE] = gMonIcon_Zygarde, + [SPECIES_ZYGARDE_50] = gMonIcon_Zygarde, + [SPECIES_ZYGARDE_10] = gMonIcon_Zygarde10, + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = gMonIcon_Zygarde10, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = gMonIcon_Zygarde, + [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, [SPECIES_DIANCIE] = gMonIcon_Diancie, - [SPECIES_HOOPA] = gMonIcon_Hoopa, + [SPECIES_DIANCIE_MEGA] = gMonIcon_DiancieMega, + [SPECIES_HOOPA_CONFINED] = gMonIcon_Hoopa, + [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, [SPECIES_VOLCANION] = gMonIcon_Volcanion, #endif - [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, - [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, - [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY, - [SPECIES_BLASTOISE_MEGA] = gMonIcon_BlastoiseMega, - [SPECIES_ALAKAZAM_MEGA] = gMonIcon_AlakazamMega, - [SPECIES_GENGAR_MEGA] = gMonIcon_GengarMega, - [SPECIES_KANGASKHAN_MEGA] = gMonIcon_KangaskhanMega, - [SPECIES_PINSIR_MEGA] = gMonIcon_PinsirMega, - [SPECIES_GYARADOS_MEGA] = gMonIcon_GyaradosMega, - [SPECIES_AERODACTYL_MEGA] = gMonIcon_AerodactylMega, - [SPECIES_MEWTWO_MEGA_X] = gMonIcon_MewtwoMegaX, - [SPECIES_MEWTWO_MEGA_Y] = gMonIcon_MewtwoMegaY, - [SPECIES_AMPHAROS_MEGA] = gMonIcon_AmpharosMega, - [SPECIES_SCIZOR_MEGA] = gMonIcon_ScizorMega, - [SPECIES_HERACROSS_MEGA] = gMonIcon_HeracrossMega, - [SPECIES_HOUNDOOM_MEGA] = gMonIcon_HoundoomMega, - [SPECIES_TYRANITAR_MEGA] = gMonIcon_TyranitarMega, - [SPECIES_BLAZIKEN_MEGA] = gMonIcon_BlazikenMega, - [SPECIES_GARDEVOIR_MEGA] = gMonIcon_GardevoirMega, - [SPECIES_MAWILE_MEGA] = gMonIcon_MawileMega, - [SPECIES_AGGRON_MEGA] = gMonIcon_AggronMega, - [SPECIES_MEDICHAM_MEGA] = gMonIcon_MedichamMega, - [SPECIES_MANECTRIC_MEGA] = gMonIcon_ManectricMega, - [SPECIES_BANETTE_MEGA] = gMonIcon_BanetteMega, - [SPECIES_ABSOL_MEGA] = gMonIcon_AbsolMega, - [SPECIES_LATIAS_MEGA] = gMonIcon_LatiasMega, - [SPECIES_LATIOS_MEGA] = gMonIcon_LatiosMega, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_GARCHOMP_MEGA] = gMonIcon_GarchompMega, - [SPECIES_LUCARIO_MEGA] = gMonIcon_LucarioMega, - [SPECIES_ABOMASNOW_MEGA] = gMonIcon_AbomasnowMega, - [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, -#endif -// Omega Ruby and Alpha Sapphire - [SPECIES_BEEDRILL_MEGA] = gMonIcon_BeedrillMega, - [SPECIES_PIDGEOT_MEGA] = gMonIcon_PidgeotMega, - [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, - [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, - [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, - [SPECIES_PIKACHU_POP_STAR] = gMonIcon_PikachuPopStar, - [SPECIES_PIKACHU_PH_D] = gMonIcon_PikachuPhD, - [SPECIES_PIKACHU_LIBRE] = gMonIcon_PikachuLibre, - [SPECIES_SLOWBRO_MEGA] = gMonIcon_SlowbroMega, - [SPECIES_STEELIX_MEGA] = gMonIcon_SteelixMega, - [SPECIES_SCEPTILE_MEGA] = gMonIcon_SceptileMega, - [SPECIES_SWAMPERT_MEGA] = gMonIcon_SwampertMega, - [SPECIES_SABLEYE_MEGA] = gMonIcon_SableyeMega, - [SPECIES_SHARPEDO_MEGA] = gMonIcon_SharpedoMega, - [SPECIES_CAMERUPT_MEGA] = gMonIcon_CameruptMega, - [SPECIES_ALTARIA_MEGA] = gMonIcon_AltariaMega, - [SPECIES_GLALIE_MEGA] = gMonIcon_GlalieMega, - [SPECIES_SALAMENCE_MEGA] = gMonIcon_SalamenceMega, - [SPECIES_METAGROSS_MEGA] = gMonIcon_MetagrossMega, - [SPECIES_KYOGRE_PRIMAL] = gMonIcon_KyogrePrimal, - [SPECIES_GROUDON_PRIMAL] = gMonIcon_GroudonPrimal, - [SPECIES_RAYQUAZA_MEGA] = gMonIcon_RayquazaMega, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA] = gMonIcon_LopunnyMega, - [SPECIES_GALLADE_MEGA] = gMonIcon_GalladeMega, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA] = gMonIcon_AudinoMega, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_DIANCIE_MEGA] = gMonIcon_DiancieMega, - [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, -#endif - #if P_GEN_7_POKEMON == TRUE -// Sun and Moon [SPECIES_ROWLET] = gMonIcon_Rowlet, [SPECIES_DARTRIX] = gMonIcon_Dartrix, [SPECIES_DECIDUEYE] = gMonIcon_Decidueye, + [SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian, [SPECIES_LITTEN] = gMonIcon_Litten, [SPECIES_TORRACAT] = gMonIcon_Torracat, [SPECIES_INCINEROAR] = gMonIcon_Incineroar, @@ -983,12 +1038,19 @@ const u8 *const gMonIconTable[] = [SPECIES_VIKAVOLT] = gMonIcon_Vikavolt, [SPECIES_CRABRAWLER] = gMonIcon_Crabrawler, [SPECIES_CRABOMINABLE] = gMonIcon_Crabominable, - [SPECIES_ORICORIO] = gMonIcon_Oricorio, + [SPECIES_ORICORIO_BAILE] = gMonIcon_Oricorio, + [SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom, + [SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau, + [SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu, [SPECIES_CUTIEFLY] = gMonIcon_Cutiefly, [SPECIES_RIBOMBEE] = gMonIcon_Ribombee, [SPECIES_ROCKRUFF] = gMonIcon_Rockruff, - [SPECIES_LYCANROC] = gMonIcon_Lycanroc, - [SPECIES_WISHIWASHI] = gMonIcon_Wishiwashi, + [SPECIES_ROCKRUFF_OWN_TEMPO] = gMonIcon_Rockruff, + [SPECIES_LYCANROC_MIDDAY] = gMonIcon_Lycanroc, + [SPECIES_LYCANROC_MIDNIGHT] = gMonIcon_LycanrocMidnight, + [SPECIES_LYCANROC_DUSK] = gMonIcon_LycanrocDusk, + [SPECIES_WISHIWASHI_SOLO] = gMonIcon_Wishiwashi, + [SPECIES_WISHIWASHI_SCHOOL] = gMonIcon_WishiwashiSchool, [SPECIES_MAREANIE] = gMonIcon_Mareanie, [SPECIES_TOXAPEX] = gMonIcon_Toxapex, [SPECIES_MUDBRAY] = gMonIcon_Mudbray, @@ -1015,12 +1077,43 @@ const u8 *const gMonIconTable[] = [SPECIES_PALOSSAND] = gMonIcon_Palossand, [SPECIES_PYUKUMUKU] = gMonIcon_Pyukumuku, [SPECIES_TYPE_NULL] = gMonIcon_TypeNull, - [SPECIES_SILVALLY] = gMonIcon_Silvally, - [SPECIES_MINIOR] = gMonIcon_Minior, + [SPECIES_SILVALLY_NORMAL] = gMonIcon_Silvally, + [SPECIES_SILVALLY_FIGHTING] = gMonIcon_Silvally, + [SPECIES_SILVALLY_FLYING] = gMonIcon_Silvally, + [SPECIES_SILVALLY_POISON] = gMonIcon_Silvally, + [SPECIES_SILVALLY_GROUND] = gMonIcon_Silvally, + [SPECIES_SILVALLY_ROCK] = gMonIcon_Silvally, + [SPECIES_SILVALLY_BUG] = gMonIcon_Silvally, + [SPECIES_SILVALLY_GHOST] = gMonIcon_Silvally, + [SPECIES_SILVALLY_STEEL] = gMonIcon_Silvally, + [SPECIES_SILVALLY_FIRE] = gMonIcon_Silvally, + [SPECIES_SILVALLY_WATER] = gMonIcon_Silvally, + [SPECIES_SILVALLY_GRASS] = gMonIcon_Silvally, + [SPECIES_SILVALLY_ELECTRIC] = gMonIcon_Silvally, + [SPECIES_SILVALLY_PSYCHIC] = gMonIcon_Silvally, + [SPECIES_SILVALLY_ICE] = gMonIcon_Silvally, + [SPECIES_SILVALLY_DRAGON] = gMonIcon_Silvally, + [SPECIES_SILVALLY_DARK] = gMonIcon_Silvally, + [SPECIES_SILVALLY_FAIRY] = gMonIcon_Silvally, + [SPECIES_MINIOR_METEOR_RED] = gMonIcon_Minior, + [SPECIES_MINIOR_METEOR_ORANGE] = gMonIcon_Minior, + [SPECIES_MINIOR_METEOR_YELLOW] = gMonIcon_Minior, + [SPECIES_MINIOR_METEOR_GREEN] = gMonIcon_Minior, + [SPECIES_MINIOR_METEOR_BLUE] = gMonIcon_Minior, + [SPECIES_MINIOR_METEOR_INDIGO] = gMonIcon_Minior, + [SPECIES_MINIOR_METEOR_VIOLET] = gMonIcon_Minior, + [SPECIES_MINIOR_CORE_RED] = gMonIcon_MiniorCoreRed, + [SPECIES_MINIOR_CORE_ORANGE] = gMonIcon_MiniorCoreOrange, + [SPECIES_MINIOR_CORE_YELLOW] = gMonIcon_MiniorCoreYellow, + [SPECIES_MINIOR_CORE_GREEN] = gMonIcon_MiniorCoreGreen, + [SPECIES_MINIOR_CORE_BLUE] = gMonIcon_MiniorCoreBlue, + [SPECIES_MINIOR_CORE_INDIGO] = gMonIcon_MiniorCoreIndigo, + [SPECIES_MINIOR_CORE_VIOLET] = gMonIcon_MiniorCoreViolet, [SPECIES_KOMALA] = gMonIcon_Komala, [SPECIES_TURTONATOR] = gMonIcon_Turtonator, [SPECIES_TOGEDEMARU] = gMonIcon_Togedemaru, - [SPECIES_MIMIKYU] = gMonIcon_Mimikyu, + [SPECIES_MIMIKYU_DISGUISED] = gMonIcon_Mimikyu, + [SPECIES_MIMIKYU_BUSTED] = gMonIcon_MimikyuBusted, [SPECIES_BRUXISH] = gMonIcon_Bruxish, [SPECIES_DRAMPA] = gMonIcon_Drampa, [SPECIES_DHELMISE] = gMonIcon_Dhelmise, @@ -1043,7 +1136,11 @@ const u8 *const gMonIconTable[] = [SPECIES_KARTANA] = gMonIcon_Kartana, [SPECIES_GUZZLORD] = gMonIcon_Guzzlord, [SPECIES_NECROZMA] = gMonIcon_Necrozma, + [SPECIES_NECROZMA_DUSK_MANE] = gMonIcon_NecrozmaDuskMane, + [SPECIES_NECROZMA_DAWN_WINGS] = gMonIcon_NecrozmaDawnWings, + [SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra, [SPECIES_MAGEARNA] = gMonIcon_Magearna, + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor, [SPECIES_MARSHADOW] = gMonIcon_Marshadow, [SPECIES_POIPOLE] = gMonIcon_Poipole, [SPECIES_NAGANADEL] = gMonIcon_Naganadel, @@ -1090,16 +1187,21 @@ const u8 *const gMonIconTable[] = [SPECIES_SILICOBRA] = gMonIcon_Silicobra, [SPECIES_SANDACONDA] = gMonIcon_Sandaconda, [SPECIES_CRAMORANT] = gMonIcon_Cramorant, + [SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping, + [SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging, [SPECIES_ARROKUDA] = gMonIcon_Arrokuda, [SPECIES_BARRASKEWDA] = gMonIcon_Barraskewda, [SPECIES_TOXEL] = gMonIcon_Toxel, - [SPECIES_TOXTRICITY] = gMonIcon_Toxtricity, + [SPECIES_TOXTRICITY_AMPED] = gMonIcon_Toxtricity, + [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, [SPECIES_SIZZLIPEDE] = gMonIcon_Sizzlipede, [SPECIES_CENTISKORCH] = gMonIcon_Centiskorch, [SPECIES_CLOBBOPUS] = gMonIcon_Clobbopus, [SPECIES_GRAPPLOCT] = gMonIcon_Grapploct, - [SPECIES_SINISTEA] = gMonIcon_Sinistea, - [SPECIES_POLTEAGEIST] = gMonIcon_Polteageist, + [SPECIES_SINISTEA_PHONY] = gMonIcon_Sinistea, + [SPECIES_SINISTEA_ANTIQUE] = gMonIcon_Sinistea, + [SPECIES_POLTEAGEIST_PHONY] = gMonIcon_Polteageist, + [SPECIES_POLTEAGEIST_ANTIQUE] = gMonIcon_Polteageist, [SPECIES_HATENNA] = gMonIcon_Hatenna, [SPECIES_HATTREM] = gMonIcon_Hattrem, [SPECIES_HATTERENE] = gMonIcon_Hatterene, @@ -1113,15 +1215,26 @@ const u8 *const gMonIconTable[] = [SPECIES_MR_RIME] = gMonIcon_MrRime, [SPECIES_RUNERIGUS] = gMonIcon_Runerigus, [SPECIES_MILCERY] = gMonIcon_Milcery, - [SPECIES_ALCREMIE] = gMonIcon_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = gMonIcon_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubyCream, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMatchaCream, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMintCream, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieLemonCream, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieSaltedCream, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubySwirl, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieCaramelSwirl, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRainbowSwirl, [SPECIES_FALINKS] = gMonIcon_Falinks, [SPECIES_PINCURCHIN] = gMonIcon_Pincurchin, [SPECIES_SNOM] = gMonIcon_Snom, [SPECIES_FROSMOTH] = gMonIcon_Frosmoth, [SPECIES_STONJOURNER] = gMonIcon_Stonjourner, - [SPECIES_EISCUE] = gMonIcon_Eiscue, - [SPECIES_INDEEDEE] = gMonIcon_Indeedee, - [SPECIES_MORPEKO] = gMonIcon_Morpeko, + [SPECIES_EISCUE_ICE_FACE] = gMonIcon_Eiscue, + [SPECIES_EISCUE_NOICE_FACE] = gMonIcon_EiscueNoiceFace, + [SPECIES_INDEEDEE_MALE] = gMonIcon_Indeedee, + [SPECIES_INDEEDEE_FEMALE] = gMonIcon_IndeedeeFemale, + [SPECIES_MORPEKO_FULL_BELLY] = gMonIcon_Morpeko, + [SPECIES_MORPEKO_HANGRY] = gMonIcon_MorpekoHangry, [SPECIES_CUFANT] = gMonIcon_Cufant, [SPECIES_COPPERAJAH] = gMonIcon_Copperajah, [SPECIES_DRACOZOLT] = gMonIcon_Dracozolt, @@ -1132,182 +1245,31 @@ const u8 *const gMonIconTable[] = [SPECIES_DREEPY] = gMonIcon_Dreepy, [SPECIES_DRAKLOAK] = gMonIcon_Drakloak, [SPECIES_DRAGAPULT] = gMonIcon_Dragapult, - [SPECIES_ZACIAN] = gMonIcon_Zacian, - [SPECIES_ZAMAZENTA] = gMonIcon_Zamazenta, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = gMonIcon_Zacian, + [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_ZacianCrownedSword, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = gMonIcon_Zamazenta, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_ZamazentaCrownedShield, [SPECIES_ETERNATUS] = gMonIcon_Eternatus, + [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_EternatusEternamax, [SPECIES_KUBFU] = gMonIcon_Kubfu, - [SPECIES_URSHIFU] = gMonIcon_Urshifu, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = gMonIcon_Urshifu, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_Urshifu, [SPECIES_ZARUDE] = gMonIcon_Zarude, + [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada, [SPECIES_REGIELEKI] = gMonIcon_Regieleki, [SPECIES_REGIDRAGO] = gMonIcon_Regidrago, [SPECIES_GLASTRIER] = gMonIcon_Glastrier, [SPECIES_SPECTRIER] = gMonIcon_Spectrier, [SPECIES_CALYREX] = gMonIcon_Calyrex, + [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider, + [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider, [SPECIES_WYRDEER] = gMonIcon_Wyrdeer, [SPECIES_KLEAVOR] = gMonIcon_Kleavor, [SPECIES_URSALUNA] = gMonIcon_Ursaluna, [SPECIES_BASCULEGION] = gMonIcon_Basculegion, [SPECIES_SNEASLER] = gMonIcon_Sneasler, [SPECIES_OVERQWIL] = gMonIcon_Overqwil, - [SPECIES_ENAMORUS] = gMonIcon_Enamorus, -#endif - - - [SPECIES_RATTATA_ALOLAN] = gMonIcon_RattataAlolan, - [SPECIES_RATICATE_ALOLAN] = gMonIcon_RaticateAlolan, - [SPECIES_RAICHU_ALOLAN] = gMonIcon_RaichuAlolan, - [SPECIES_SANDSHREW_ALOLAN] = gMonIcon_SandshrewAlolan, - [SPECIES_SANDSLASH_ALOLAN] = gMonIcon_SandslashAlolan, - [SPECIES_VULPIX_ALOLAN] = gMonIcon_VulpixAlolan, - [SPECIES_NINETALES_ALOLAN] = gMonIcon_NinetalesAlolan, - [SPECIES_DIGLETT_ALOLAN] = gMonIcon_DiglettAlolan, - [SPECIES_DUGTRIO_ALOLAN] = gMonIcon_DugtrioAlolan, - [SPECIES_MEOWTH_ALOLAN] = gMonIcon_MeowthAlolan, - [SPECIES_PERSIAN_ALOLAN] = gMonIcon_PersianAlolan, - [SPECIES_GEODUDE_ALOLAN] = gMonIcon_GeodudeAlolan, - [SPECIES_GRAVELER_ALOLAN] = gMonIcon_GravelerAlolan, - [SPECIES_GOLEM_ALOLAN] = gMonIcon_GolemAlolan, - [SPECIES_GRIMER_ALOLAN] = gMonIcon_GrimerAlolan, - [SPECIES_MUK_ALOLAN] = gMonIcon_MukAlolan, - [SPECIES_EXEGGUTOR_ALOLAN] = gMonIcon_ExeggutorAlolan, - [SPECIES_MAROWAK_ALOLAN] = gMonIcon_MarowakAlolan, - [SPECIES_MEOWTH_GALARIAN] = gMonIcon_MeowthGalarian, - [SPECIES_PONYTA_GALARIAN] = gMonIcon_PonytaGalarian, - [SPECIES_RAPIDASH_GALARIAN] = gMonIcon_RapidashGalarian, - [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_SlowpokeGalarian, - [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_SlowbroGalarian, - [SPECIES_FARFETCHD_GALARIAN] = gMonIcon_FarfetchdGalarian, - [SPECIES_WEEZING_GALARIAN] = gMonIcon_WeezingGalarian, - [SPECIES_MR_MIME_GALARIAN] = gMonIcon_MrMimeGalarian, - [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_ArticunoGalarian, - [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_ZapdosGalarian, - [SPECIES_MOLTRES_GALARIAN] = gMonIcon_MoltresGalarian, - [SPECIES_SLOWKING_GALARIAN] = gMonIcon_SlowkingGalarian, - [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian, - [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian, - [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, - [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian, - [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, - [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, -#endif - [SPECIES_GROWLITHE_HISUIAN] = gMonIcon_GrowlitheHisuian, - [SPECIES_ARCANINE_HISUIAN] = gMonIcon_ArcanineHisuian, - [SPECIES_VOLTORB_HISUIAN] = gMonIcon_VoltorbHisuian, - [SPECIES_ELECTRODE_HISUIAN] = gMonIcon_ElectrodeHisuian, - [SPECIES_TYPHLOSION_HISUIAN] = gMonIcon_TyphlosionHisuian, - [SPECIES_QWILFISH_HISUIAN] = gMonIcon_QwilfishHisuian, - [SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian, -#if P_GEN_5_POKEMON == TRUE - [SPECIES_SAMUROTT_HISUIAN] = gMonIcon_SamurottHisuian, - [SPECIES_LILLIGANT_HISUIAN] = gMonIcon_LilligantHisuian, - [SPECIES_ZORUA_HISUIAN] = gMonIcon_ZoruaHisuian, - [SPECIES_ZOROARK_HISUIAN] = gMonIcon_ZoroarkHisuian, - [SPECIES_BRAVIARY_HISUIAN] = gMonIcon_BraviaryHisuian, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian, - [SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian, - [SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian, -#endif - [SPECIES_PIKACHU_ORIGINAL_CAP] = gMonIcon_PikachuOriginalCap, - [SPECIES_PIKACHU_HOENN_CAP] = gMonIcon_PikachuHoennCap, - [SPECIES_PIKACHU_SINNOH_CAP] = gMonIcon_PikachuSinnohCap, - [SPECIES_PIKACHU_UNOVA_CAP] = gMonIcon_PikachuUnovaCap, - [SPECIES_PIKACHU_KALOS_CAP] = gMonIcon_PikachuKalosCap, - [SPECIES_PIKACHU_ALOLA_CAP] = gMonIcon_PikachuAlolaCap, - [SPECIES_PIKACHU_PARTNER_CAP] = gMonIcon_PikachuPartnerCap, - [SPECIES_PIKACHU_WORLD_CAP] = gMonIcon_QuestionMark, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_DIALGA_ORIGIN] = gMonIcon_DialgaOrigin, - [SPECIES_PALKIA_ORIGIN] = gMonIcon_PalkiaOrigin, -#endif -#if P_GEN_5_POKEMON == TRUE - - [SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped, - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = gMonIcon_DarmanitanGalarianZenMode, -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_GRENINJA_BATTLE_BOND] = gMonIcon_Greninja, - [SPECIES_GRENINJA_ASH] = gMonIcon_GreninjaAsh, - - [SPECIES_ZYGARDE_10] = gMonIcon_Zygarde10, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = gMonIcon_Zygarde10, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = gMonIcon_Zygarde, - [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom, - [SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau, - [SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu, - [SPECIES_ROCKRUFF_OWN_TEMPO] = gMonIcon_Rockruff, - [SPECIES_LYCANROC_MIDNIGHT] = gMonIcon_LycanrocMidnight, - [SPECIES_LYCANROC_DUSK] = gMonIcon_LycanrocDusk, - [SPECIES_WISHIWASHI_SCHOOL] = gMonIcon_WishiwashiSchool, - [SPECIES_SILVALLY_FIGHTING] = gMonIcon_Silvally, - [SPECIES_SILVALLY_FLYING] = gMonIcon_Silvally, - [SPECIES_SILVALLY_POISON] = gMonIcon_Silvally, - [SPECIES_SILVALLY_GROUND] = gMonIcon_Silvally, - [SPECIES_SILVALLY_ROCK] = gMonIcon_Silvally, - [SPECIES_SILVALLY_BUG] = gMonIcon_Silvally, - [SPECIES_SILVALLY_GHOST] = gMonIcon_Silvally, - [SPECIES_SILVALLY_STEEL] = gMonIcon_Silvally, - [SPECIES_SILVALLY_FIRE] = gMonIcon_Silvally, - [SPECIES_SILVALLY_WATER] = gMonIcon_Silvally, - [SPECIES_SILVALLY_GRASS] = gMonIcon_Silvally, - [SPECIES_SILVALLY_ELECTRIC] = gMonIcon_Silvally, - [SPECIES_SILVALLY_PSYCHIC] = gMonIcon_Silvally, - [SPECIES_SILVALLY_ICE] = gMonIcon_Silvally, - [SPECIES_SILVALLY_DRAGON] = gMonIcon_Silvally, - [SPECIES_SILVALLY_DARK] = gMonIcon_Silvally, - [SPECIES_SILVALLY_FAIRY] = gMonIcon_Silvally, - [SPECIES_MINIOR_METEOR_ORANGE] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_YELLOW] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_GREEN] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_BLUE] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_INDIGO] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_VIOLET] = gMonIcon_Minior, - [SPECIES_MINIOR_CORE_RED] = gMonIcon_MiniorCoreRed, - [SPECIES_MINIOR_CORE_ORANGE] = gMonIcon_MiniorCoreOrange, - [SPECIES_MINIOR_CORE_YELLOW] = gMonIcon_MiniorCoreYellow, - [SPECIES_MINIOR_CORE_GREEN] = gMonIcon_MiniorCoreGreen, - [SPECIES_MINIOR_CORE_BLUE] = gMonIcon_MiniorCoreBlue, - [SPECIES_MINIOR_CORE_INDIGO] = gMonIcon_MiniorCoreIndigo, - [SPECIES_MINIOR_CORE_VIOLET] = gMonIcon_MiniorCoreViolet, - [SPECIES_MIMIKYU_BUSTED] = gMonIcon_MimikyuBusted, - [SPECIES_NECROZMA_DUSK_MANE] = gMonIcon_NecrozmaDuskMane, - [SPECIES_NECROZMA_DAWN_WINGS] = gMonIcon_NecrozmaDawnWings, - [SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra, - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor, -#endif -#if P_GEN_8_POKEMON == TRUE - [SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping, - [SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging, - [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, - [SPECIES_SINISTEA_ANTIQUE] = gMonIcon_Sinistea, - [SPECIES_POLTEAGEIST_ANTIQUE] = gMonIcon_Polteageist, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubyCream, - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMatchaCream, - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMintCream, - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieLemonCream, - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieSaltedCream, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubySwirl, - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieCaramelSwirl, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRainbowSwirl, - [SPECIES_EISCUE_NOICE_FACE] = gMonIcon_EiscueNoiceFace, - [SPECIES_INDEEDEE_FEMALE] = gMonIcon_IndeedeeFemale, - [SPECIES_MORPEKO_HANGRY] = gMonIcon_MorpekoHangry, - [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_ZacianCrownedSword, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_ZamazentaCrownedShield, - [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_EternatusEternamax, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_Urshifu, - [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada, - [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider, - [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider, + [SPECIES_ENAMORUS_INCARNATE] = gMonIcon_Enamorus, [SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian, #endif [SPECIES_EGG] = gMonIcon_Egg, @@ -1346,31 +1308,60 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BULBASAUR] = 4, [SPECIES_IVYSAUR] = 4, [SPECIES_VENUSAUR] = 4, + [SPECIES_VENUSAUR_MEGA] = 1, + [SPECIES_VENUSAUR_GIGANTAMAX] = 1, //Todo [SPECIES_CHARMANDER] = 0, [SPECIES_CHARMELEON] = 0, [SPECIES_CHARIZARD] = 0, + [SPECIES_CHARIZARD_MEGA_X] = 0, + [SPECIES_CHARIZARD_MEGA_Y] = 0, + [SPECIES_CHARIZARD_GIGANTAMAX] = 0, //Todo [SPECIES_SQUIRTLE] = 0, [SPECIES_WARTORTLE] = 2, [SPECIES_BLASTOISE] = 2, + [SPECIES_BLASTOISE_MEGA] = 2, + [SPECIES_BLASTOISE_GIGANTAMAX] = 2, //Todo [SPECIES_CATERPIE] = 1, [SPECIES_METAPOD] = 1, [SPECIES_BUTTERFREE] = 0, + [SPECIES_BUTTERFREE_GIGANTAMAX] = 0, //Todo [SPECIES_WEEDLE] = 2, [SPECIES_KAKUNA] = 2, [SPECIES_BEEDRILL] = 2, + [SPECIES_BEEDRILL_MEGA] = 2, [SPECIES_PIDGEY] = 0, [SPECIES_PIDGEOTTO] = 0, [SPECIES_PIDGEOT] = 0, + [SPECIES_PIDGEOT_MEGA] = 0, [SPECIES_RATTATA] = 2, + [SPECIES_RATTATA_ALOLAN] = 2, [SPECIES_RATICATE] = 2, + [SPECIES_RATICATE_ALOLAN] = 2, [SPECIES_SPEAROW] = 0, [SPECIES_FEAROW] = 0, [SPECIES_EKANS] = 2, [SPECIES_ARBOK] = 2, [SPECIES_PIKACHU] = 2, + [SPECIES_PIKACHU_COSPLAY] = 2, + [SPECIES_PIKACHU_ROCK_STAR] = 1, + [SPECIES_PIKACHU_BELLE] = 0, + [SPECIES_PIKACHU_POP_STAR] = 0, + [SPECIES_PIKACHU_PH_D] = 1, + [SPECIES_PIKACHU_LIBRE] = 0, + [SPECIES_PIKACHU_ORIGINAL_CAP] = 0, + [SPECIES_PIKACHU_HOENN_CAP] = 0, + [SPECIES_PIKACHU_SINNOH_CAP] = 0, + [SPECIES_PIKACHU_UNOVA_CAP] = 0, + [SPECIES_PIKACHU_KALOS_CAP] = 0, + [SPECIES_PIKACHU_ALOLA_CAP] = 0, + [SPECIES_PIKACHU_PARTNER_CAP] = 0, + [SPECIES_PIKACHU_WORLD_CAP] = 0, [SPECIES_RAICHU] = 0, + [SPECIES_RAICHU_ALOLAN] = 2, [SPECIES_SANDSHREW] = 2, + [SPECIES_SANDSHREW_ALOLAN] = 0, [SPECIES_SANDSLASH] = 2, + [SPECIES_SANDSLASH_ALOLAN] = 0, [SPECIES_NIDORAN_F] = 0, [SPECIES_NIDORINA] = 0, [SPECIES_NIDOQUEEN] = 2, @@ -1380,7 +1371,9 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CLEFAIRY] = 0, [SPECIES_CLEFABLE] = 0, [SPECIES_VULPIX] = 5, + [SPECIES_VULPIX_ALOLAN] = 2, [SPECIES_NINETALES] = 3, + [SPECIES_NINETALES_ALOLAN] = 2, [SPECIES_JIGGLYPUFF] = 0, [SPECIES_WIGGLYTUFF] = 0, [SPECIES_ZUBAT] = 2, @@ -1393,21 +1386,29 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_VENONAT] = 2, [SPECIES_VENOMOTH] = 2, [SPECIES_DIGLETT] = 2, + [SPECIES_DIGLETT_ALOLAN] = 2, [SPECIES_DUGTRIO] = 2, + [SPECIES_DUGTRIO_ALOLAN] = 2, [SPECIES_MEOWTH] = 1, + [SPECIES_MEOWTH_ALOLAN] = 2, + [SPECIES_MEOWTH_GALARIAN] = 0, [SPECIES_PERSIAN] = 1, + [SPECIES_PERSIAN_ALOLAN] = 2, [SPECIES_PSYDUCK] = 1, [SPECIES_GOLDUCK] = 0, [SPECIES_MANKEY] = 1, [SPECIES_PRIMEAPE] = 2, [SPECIES_GROWLITHE] = 3, + [SPECIES_GROWLITHE_HISUIAN] = 0, [SPECIES_ARCANINE] = 3, + [SPECIES_ARCANINE_HISUIAN] = 0, [SPECIES_POLIWAG] = 0, [SPECIES_POLIWHIRL] = 0, [SPECIES_POLIWRATH] = 0, [SPECIES_ABRA] = 2, [SPECIES_KADABRA] = 2, [SPECIES_ALAKAZAM] = 2, + [SPECIES_ALAKAZAM_MEGA] = 2, [SPECIES_MACHOP] = 0, [SPECIES_MACHOKE] = 2, [SPECIES_MACHAMP] = 0, @@ -1417,47 +1418,65 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_TENTACOOL] = 0, [SPECIES_TENTACRUEL] = 0, [SPECIES_GEODUDE] = 1, + [SPECIES_GEODUDE_ALOLAN] = 2, [SPECIES_GRAVELER] = 1, + [SPECIES_GRAVELER_ALOLAN] = 2, [SPECIES_GOLEM] = 2, + [SPECIES_GOLEM_ALOLAN] = 2, [SPECIES_PONYTA] = 3, + [SPECIES_PONYTA_GALARIAN] = 2, [SPECIES_RAPIDASH] = 3, + [SPECIES_RAPIDASH_GALARIAN] = 2, [SPECIES_SLOWPOKE] = 0, + [SPECIES_SLOWPOKE_GALARIAN] = 1, [SPECIES_SLOWBRO] = 0, + [SPECIES_SLOWBRO_MEGA] = 0, + [SPECIES_SLOWBRO_GALARIAN] = 0, [SPECIES_MAGNEMITE] = 0, [SPECIES_MAGNETON] = 0, [SPECIES_FARFETCHD] = 1, + [SPECIES_FARFETCHD_GALARIAN] = 1, [SPECIES_DODUO] = 2, [SPECIES_DODRIO] = 2, [SPECIES_SEEL] = 0, [SPECIES_DEWGONG] = 2, [SPECIES_GRIMER] = 2, + [SPECIES_GRIMER_ALOLAN] = 1, [SPECIES_MUK] = 2, + [SPECIES_MUK_ALOLAN] = 0, [SPECIES_SHELLDER] = 2, [SPECIES_CLOYSTER] = 2, [SPECIES_GASTLY] = 2, [SPECIES_HAUNTER] = 2, [SPECIES_GENGAR] = 2, + [SPECIES_GENGAR_MEGA] = 2, [SPECIES_ONIX] = 2, [SPECIES_DROWZEE] = 2, [SPECIES_HYPNO] = 2, [SPECIES_KRABBY] = 0, [SPECIES_KINGLER] = 0, [SPECIES_VOLTORB] = 0, + [SPECIES_VOLTORB_HISUIAN] = 0, [SPECIES_ELECTRODE] = 0, + [SPECIES_ELECTRODE_HISUIAN] = 1, [SPECIES_EXEGGCUTE] = 0, [SPECIES_EXEGGUTOR] = 1, + [SPECIES_EXEGGUTOR_ALOLAN] = 1, [SPECIES_CUBONE] = 2, [SPECIES_MAROWAK] = 2, + [SPECIES_MAROWAK_ALOLAN] = 1, [SPECIES_HITMONLEE] = 2, [SPECIES_HITMONCHAN] = 2, [SPECIES_LICKITUNG] = 0, [SPECIES_KOFFING] = 2, [SPECIES_WEEZING] = 2, + [SPECIES_WEEZING_GALARIAN] = 1, [SPECIES_RHYHORN] = 1, [SPECIES_RHYDON] = 1, [SPECIES_CHANSEY] = 0, [SPECIES_TANGELA] = 0, [SPECIES_KANGASKHAN] = 2, + [SPECIES_KANGASKHAN_MEGA] = 2, [SPECIES_HORSEA] = 0, [SPECIES_SEADRA] = 0, [SPECIES_GOLDEEN] = 0, @@ -1465,14 +1484,17 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_STARYU] = 2, [SPECIES_STARMIE] = 2, [SPECIES_MR_MIME] = 0, + [SPECIES_MR_MIME_GALARIAN] = 0, [SPECIES_SCYTHER] = 1, [SPECIES_JYNX] = 2, [SPECIES_ELECTABUZZ] = 1, [SPECIES_MAGMAR] = 0, [SPECIES_PINSIR] = 2, + [SPECIES_PINSIR_MEGA] = 2, [SPECIES_TAUROS] = 2, [SPECIES_MAGIKARP] = 0, [SPECIES_GYARADOS] = 0, + [SPECIES_GYARADOS_MEGA] = 0, [SPECIES_LAPRAS] = 2, [SPECIES_DITTO] = 2, [SPECIES_EEVEE] = 2, @@ -1485,14 +1507,20 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_KABUTO] = 2, [SPECIES_KABUTOPS] = 2, [SPECIES_AERODACTYL] = 2, + [SPECIES_AERODACTYL_MEGA] = 2, [SPECIES_SNORLAX] = 3, [SPECIES_ARTICUNO] = 2, + [SPECIES_ARTICUNO_GALARIAN] = 2, [SPECIES_ZAPDOS] = 0, + [SPECIES_ZAPDOS_GALARIAN] = 0, [SPECIES_MOLTRES] = 0, + [SPECIES_MOLTRES_GALARIAN] = 0, [SPECIES_DRATINI] = 0, [SPECIES_DRAGONAIR] = 0, [SPECIES_DRAGONITE] = 2, [SPECIES_MEWTWO] = 2, + [SPECIES_MEWTWO_MEGA_X] = 2, + [SPECIES_MEWTWO_MEGA_Y] = 2, [SPECIES_MEW] = 0, [SPECIES_CHIKORITA] = 1, [SPECIES_BAYLEEF] = 1, @@ -1500,6 +1528,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CYNDAQUIL] = 3, [SPECIES_QUILAVA] = 3, [SPECIES_TYPHLOSION] = 3, + [SPECIES_TYPHLOSION_HISUIAN] = 1, [SPECIES_TOTODILE] = 0, [SPECIES_CROCONAW] = 0, [SPECIES_FERALIGATR] = 0, @@ -1515,6 +1544,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CHINCHOU] = 2, [SPECIES_LANTURN] = 0, [SPECIES_PICHU] = 1, + [SPECIES_PICHU_SPIKY_EARED] = 1, [SPECIES_CLEFFA] = 0, [SPECIES_IGGLYBUFF] = 1, [SPECIES_TOGEPI] = 0, @@ -1524,6 +1554,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MAREEP] = 0, [SPECIES_FLAAFFY] = 0, [SPECIES_AMPHAROS] = 0, + [SPECIES_AMPHAROS_MEGA] = 0, [SPECIES_BELLOSSOM] = 1, [SPECIES_MARILL] = 0, [SPECIES_AZUMARILL] = 0, @@ -1542,6 +1573,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_UMBREON] = 0, [SPECIES_MURKROW] = 2, [SPECIES_SLOWKING] = 0, + [SPECIES_SLOWKING_GALARIAN] = 2, [SPECIES_MISDREAVUS] = 0, [SPECIES_UNOWN ... SPECIES_UNOWN_QMARK] = 0, [SPECIES_WOBBUFFET] = 0, @@ -1551,13 +1583,18 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DUNSPARCE] = 0, [SPECIES_GLIGAR] = 0, [SPECIES_STEELIX] = 0, + [SPECIES_STEELIX_MEGA] = 0, [SPECIES_SNUBBULL] = 0, [SPECIES_GRANBULL] = 2, [SPECIES_QWILFISH] = 0, + [SPECIES_QWILFISH_HISUIAN] = 0, [SPECIES_SCIZOR] = 0, + [SPECIES_SCIZOR_MEGA] = 0, [SPECIES_SHUCKLE] = 1, [SPECIES_HERACROSS] = 0, + [SPECIES_HERACROSS_MEGA] = 0, [SPECIES_SNEASEL] = 0, + [SPECIES_SNEASEL_HISUIAN] = 2, [SPECIES_TEDDIURSA] = 0, [SPECIES_URSARING] = 2, [SPECIES_SLUGMA] = 0, @@ -1565,6 +1602,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SWINUB] = 2, [SPECIES_PILOSWINE] = 2, [SPECIES_CORSOLA] = 0, + [SPECIES_CORSOLA_GALARIAN] = 0, [SPECIES_REMORAID] = 0, [SPECIES_OCTILLERY] = 0, [SPECIES_DELIBIRD] = 1, @@ -1572,6 +1610,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SKARMORY] = 0, [SPECIES_HOUNDOUR] = 0, [SPECIES_HOUNDOOM] = 0, + [SPECIES_HOUNDOOM_MEGA] = 0, [SPECIES_KINGDRA] = 0, [SPECIES_PHANPY] = 0, [SPECIES_DONPHAN] = 0, @@ -1591,22 +1630,28 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_LARVITAR] = 1, [SPECIES_PUPITAR] = 2, [SPECIES_TYRANITAR] = 4, + [SPECIES_TYRANITAR_MEGA] = 1, [SPECIES_LUGIA] = 0, [SPECIES_HO_OH] = 1, [SPECIES_CELEBI] = 1, [SPECIES_TREECKO] = 1, [SPECIES_GROVYLE] = 1, [SPECIES_SCEPTILE] = 1, + [SPECIES_SCEPTILE_MEGA] = 1, [SPECIES_TORCHIC] = 0, [SPECIES_COMBUSKEN] = 0, [SPECIES_BLAZIKEN] = 0, + [SPECIES_BLAZIKEN_MEGA] = 0, [SPECIES_MUDKIP] = 0, [SPECIES_MARSHTOMP] = 0, [SPECIES_SWAMPERT] = 0, + [SPECIES_SWAMPERT_MEGA] = 0, [SPECIES_POOCHYENA] = 2, [SPECIES_MIGHTYENA] = 2, [SPECIES_ZIGZAGOON] = 2, + [SPECIES_ZIGZAGOON_GALARIAN] = 0, [SPECIES_LINOONE] = 2, + [SPECIES_LINOONE_GALARIAN] = 0, [SPECIES_WURMPLE] = 0, [SPECIES_SILCOON] = 2, [SPECIES_BEAUTIFLY] = 0, @@ -1625,6 +1670,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_RALTS] = 1, [SPECIES_KIRLIA] = 1, [SPECIES_GARDEVOIR] = 1, + [SPECIES_GARDEVOIR_MEGA] = 1, [SPECIES_SURSKIT] = 0, [SPECIES_MASQUERAIN] = 0, [SPECIES_SHROOMISH] = 1, @@ -1645,14 +1691,19 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SKITTY] = 0, [SPECIES_DELCATTY] = 2, [SPECIES_SABLEYE] = 2, + [SPECIES_SABLEYE_MEGA] = 2, [SPECIES_MAWILE] = 2, + [SPECIES_MAWILE_MEGA] = 0, [SPECIES_ARON] = 2, [SPECIES_LAIRON] = 2, [SPECIES_AGGRON] = 2, + [SPECIES_AGGRON_MEGA] = 2, [SPECIES_MEDITITE] = 0, [SPECIES_MEDICHAM] = 0, + [SPECIES_MEDICHAM_MEGA] = 0, [SPECIES_ELECTRIKE] = 1, [SPECIES_MANECTRIC] = 0, + [SPECIES_MANECTRIC_MEGA] = 0, [SPECIES_PLUSLE] = 0, [SPECIES_MINUN] = 0, [SPECIES_VOLBEAT] = 0, @@ -1662,10 +1713,12 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SWALOT] = 2, [SPECIES_CARVANHA] = 0, [SPECIES_SHARPEDO] = 0, + [SPECIES_SHARPEDO_MEGA] = 0, [SPECIES_WAILMER] = 2, [SPECIES_WAILORD] = 0, [SPECIES_NUMEL] = 1, [SPECIES_CAMERUPT] = 0, + [SPECIES_CAMERUPT_MEGA] = 0, [SPECIES_TORKOAL] = 2, [SPECIES_SPOINK] = 0, [SPECIES_GRUMPIG] = 2, @@ -1677,6 +1730,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CACTURNE] = 1, [SPECIES_SWABLU] = 0, [SPECIES_ALTARIA] = 0, + [SPECIES_ALTARIA_MEGA] = 0, [SPECIES_ZANGOOSE] = 0, [SPECIES_SEVIPER] = 2, [SPECIES_LUNATONE] = 1, @@ -1700,14 +1754,17 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_KECLEON] = 1, [SPECIES_SHUPPET] = 0, [SPECIES_BANETTE] = 0, + [SPECIES_BANETTE_MEGA] = 0, [SPECIES_DUSKULL] = 0, [SPECIES_DUSCLOPS] = 0, [SPECIES_TROPIUS] = 1, [SPECIES_CHIMECHO] = 0, [SPECIES_ABSOL] = 0, + [SPECIES_ABSOL_MEGA] = 0, [SPECIES_WYNAUT] = 0, [SPECIES_SNORUNT] = 2, [SPECIES_GLALIE] = 0, + [SPECIES_GLALIE_MEGA] = 0, [SPECIES_SPHEAL] = 2, [SPECIES_SEALEO] = 2, [SPECIES_WALREIN] = 0, @@ -1719,23 +1776,30 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BAGON] = 0, [SPECIES_SHELGON] = 2, [SPECIES_SALAMENCE] = 0, + [SPECIES_SALAMENCE_MEGA] = 0, [SPECIES_BELDUM] = 0, [SPECIES_METANG] = 0, [SPECIES_METAGROSS] = 0, + [SPECIES_METAGROSS_MEGA] = 0, [SPECIES_REGIROCK] = 2, [SPECIES_REGICE] = 0, [SPECIES_REGISTEEL] = 2, [SPECIES_LATIAS] = 0, + [SPECIES_LATIAS_MEGA] = 2, [SPECIES_LATIOS] = 0, + [SPECIES_LATIOS_MEGA] = 2, [SPECIES_KYOGRE] = 2, + [SPECIES_KYOGRE_PRIMAL] = 0, [SPECIES_GROUDON] = 0, + [SPECIES_GROUDON_PRIMAL] = 0, [SPECIES_RAYQUAZA] = 1, + [SPECIES_RAYQUAZA_MEGA] = 1, [SPECIES_JIRACHI] = 0, [SPECIES_DEOXYS_NORMAL] = 0, [SPECIES_DEOXYS_ATTACK] = 0, [SPECIES_DEOXYS_DEFENSE] = 0, [SPECIES_DEOXYS_SPEED] = 0, -// Diamond and Pearl +// Gen 4 [SPECIES_TURTWIG] = 1, [SPECIES_GROTLE] = 1, [SPECIES_TORTERRA] = 1, @@ -1776,15 +1840,16 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CHERUBI] = 1, [SPECIES_CHERRIM_OVERCAST] = 0, [SPECIES_CHERRIM_SUNSHINE] = 1, - [SPECIES_SHELLOS] = 0, + [SPECIES_SHELLOS_WEST_SEA] = 0, [SPECIES_SHELLOS_EAST_SEA] = 0, - [SPECIES_GASTRODON] = 0, + [SPECIES_GASTRODON_WEST_SEA] = 0, [SPECIES_GASTRODON_EAST_SEA] = 0, [SPECIES_AMBIPOM] = 2, [SPECIES_DRIFLOON] = 2, [SPECIES_DRIFBLIM] = 2, [SPECIES_BUNEARY] = 2, [SPECIES_LOPUNNY] = 2, + [SPECIES_LOPUNNY_MEGA] = 2, [SPECIES_MISMAGIUS] = 2, [SPECIES_HONCHKROW] = 2, [SPECIES_GLAMEOW] = 0, @@ -1802,9 +1867,11 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_GIBLE] = 0, [SPECIES_GABITE] = 0, [SPECIES_GARCHOMP] = 0, + [SPECIES_GARCHOMP_MEGA] = 0, [SPECIES_MUNCHLAX] = 3, [SPECIES_RIOLU] = 2, [SPECIES_LUCARIO] = 2, + [SPECIES_LUCARIO_MEGA] = 2, [SPECIES_HIPPOPOTAS] = 1, [SPECIES_HIPPOWDON] = 1, [SPECIES_SKORUPI] = 0, @@ -1817,6 +1884,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MANTYKE] = 0, [SPECIES_SNOVER] = 1, [SPECIES_ABOMASNOW] = 1, + [SPECIES_ABOMASNOW_MEGA] = 1, [SPECIES_WEAVILE] = 0, [SPECIES_MAGNEZONE] = 0, [SPECIES_LICKILICKY] = 1, @@ -1832,23 +1900,33 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MAMOSWINE] = 2, [SPECIES_PORYGON_Z] = 0, [SPECIES_GALLADE] = 1, + [SPECIES_GALLADE_MEGA] = 1, [SPECIES_PROBOPASS] = 0, [SPECIES_DUSKNOIR] = 2, [SPECIES_FROSLASS] = 0, [SPECIES_ROTOM] = 0, + [SPECIES_ROTOM_HEAT] = 0, + [SPECIES_ROTOM_WASH] = 0, + [SPECIES_ROTOM_FROST] = 5, + [SPECIES_ROTOM_FAN] = 0, + [SPECIES_ROTOM_MOW] = 0, [SPECIES_UXIE] = 0, [SPECIES_MESPRIT] = 0, [SPECIES_AZELF] = 0, [SPECIES_DIALGA] = 2, + [SPECIES_DIALGA_ORIGIN] = 0, [SPECIES_PALKIA] = 2, + [SPECIES_PALKIA_ORIGIN] = 2, [SPECIES_HEATRAN] = 0, [SPECIES_REGIGIGAS] = 0, [SPECIES_GIRATINA_ALTERED] = 0, + [SPECIES_GIRATINA_ORIGIN] = 0, [SPECIES_CRESSELIA] = 0, [SPECIES_PHIONE] = 0, [SPECIES_MANAPHY] = 0, [SPECIES_DARKRAI] = 0, [SPECIES_SHAYMIN_LAND] = 1, + [SPECIES_SHAYMIN_SKY] = 1, [SPECIES_ARCEUS_NORMAL] = 1, [SPECIES_ARCEUS_FIGHTING] = 1, [SPECIES_ARCEUS_FLYING] = 1, @@ -1866,17 +1944,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ARCEUS_ICE] = 1, [SPECIES_ARCEUS_DRAGON] = 1, [SPECIES_ARCEUS_DARK] = 1, -// Platinum - [SPECIES_ROTOM_HEAT] = 0, - [SPECIES_ROTOM_WASH] = 0, - [SPECIES_ROTOM_FROST] = 5, - [SPECIES_ROTOM_FAN] = 0, - [SPECIES_ROTOM_MOW] = 0, - [SPECIES_GIRATINA_ORIGIN] = 0, - [SPECIES_SHAYMIN_SKY] = 1, -// HeartGold and SoulSilver - [SPECIES_PICHU_SPIKY_EARED] = 1, -// Black and White + [SPECIES_ARCEUS_FAIRY] = 1, +// Gen 5 [SPECIES_VICTINI] = 0, [SPECIES_SNIVY] = 1, [SPECIES_SERVINE] = 1, @@ -1887,6 +1956,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_OSHAWOTT] = 0, [SPECIES_DEWOTT] = 0, [SPECIES_SAMUROTT] = 2, + [SPECIES_SAMUROTT_HISUIAN] = 0, [SPECIES_PATRAT] = 2, [SPECIES_WATCHOG] = 2, [SPECIES_LILLIPUP] = 2, @@ -1915,6 +1985,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DRILBUR] = 0, [SPECIES_EXCADRILL] = 0, [SPECIES_AUDINO] = 1, + [SPECIES_AUDINO_MEGA] = 1, [SPECIES_TIMBURR] = 1, [SPECIES_GURDURR] = 1, [SPECIES_CONKELDURR] = 1, @@ -1933,14 +2004,19 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_WHIMSICOTT] = 1, [SPECIES_PETILIL] = 1, [SPECIES_LILLIGANT] = 1, - [SPECIES_BASCULIN] = 1, + [SPECIES_LILLIGANT_HISUIAN] = 1, + [SPECIES_BASCULIN_RED_STRIPED] = 1, [SPECIES_BASCULIN_BLUE_STRIPED] = 0, + [SPECIES_BASCULIN_WHITE_STRIPED] = 0, [SPECIES_SANDILE] = 1, [SPECIES_KROKOROK] = 1, [SPECIES_KROOKODILE] = 0, [SPECIES_DARUMAKA] = 0, - [SPECIES_DARMANITAN] = 0, + [SPECIES_DARUMAKA_GALARIAN] = 0, + [SPECIES_DARMANITAN_STANDARD_MODE] = 0, [SPECIES_DARMANITAN_ZEN_MODE] = 0, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = 0, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = 0, [SPECIES_MARACTUS] = 1, [SPECIES_DWEBBLE] = 0, [SPECIES_CRUSTLE] = 2, @@ -1948,6 +2024,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SCRAFTY] = 0, [SPECIES_SIGILYPH] = 0, [SPECIES_YAMASK] = 0, + [SPECIES_YAMASK_GALARIAN] = 2, [SPECIES_COFAGRIGUS] = 0, [SPECIES_TIRTOUGA] = 2, [SPECIES_CARRACOSTA] = 2, @@ -1956,7 +2033,9 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_TRUBBISH] = 1, [SPECIES_GARBODOR] = 1, [SPECIES_ZORUA] = 0, + [SPECIES_ZORUA_HISUIAN] = 0, [SPECIES_ZOROARK] = 0, + [SPECIES_ZOROARK_HISUIAN] = 0, [SPECIES_MINCCINO] = 0, [SPECIES_CINCCINO] = 0, [SPECIES_GOTHITA] = 2, @@ -1970,11 +2049,11 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_VANILLITE] = 0, [SPECIES_VANILLISH] = 2, [SPECIES_VANILLUXE] = 2, - [SPECIES_DEERLING] = 1, + [SPECIES_DEERLING_SPRING] = 1, [SPECIES_DEERLING_SUMMER] = 1, [SPECIES_DEERLING_AUTUMN] = 0, [SPECIES_DEERLING_WINTER] = 2, - [SPECIES_SAWSBUCK] = 1, + [SPECIES_SAWSBUCK_SPRING] = 1, [SPECIES_SAWSBUCK_SUMMER] = 1, [SPECIES_SAWSBUCK_AUTUMN] = 1, [SPECIES_SAWSBUCK_WINTER] = 1, @@ -2010,6 +2089,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SHELMET] = 1, [SPECIES_ACCELGOR] = 1, [SPECIES_STUNFISK] = 2, + [SPECIES_STUNFISK_GALARIAN] = 1, [SPECIES_MIENFOO] = 1, [SPECIES_MIENSHAO] = 2, [SPECIES_DRUDDIGON] = 0, @@ -2020,6 +2100,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BOUFFALANT] = 2, [SPECIES_RUFFLET] = 2, [SPECIES_BRAVIARY] = 0, + [SPECIES_BRAVIARY_HISUIAN] = 2, [SPECIES_VULLABY] = 0, [SPECIES_MANDIBUZZ] = 1, [SPECIES_HEATMOR] = 2, @@ -2032,28 +2113,27 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_COBALION] = 0, [SPECIES_TERRAKION] = 2, [SPECIES_VIRIZION] = 1, - [SPECIES_TORNADUS] = 1, - [SPECIES_THUNDURUS] = 0, + [SPECIES_TORNADUS_INCARNATE] = 1, + [SPECIES_TORNADUS_THERIAN] = 1, + [SPECIES_THUNDURUS_INCARNATE] = 0, + [SPECIES_THUNDURUS_THERIAN] = 0, [SPECIES_RESHIRAM] = 0, [SPECIES_ZEKROM] = 2, - [SPECIES_LANDORUS] = 0, + [SPECIES_LANDORUS_INCARNATE] = 0, + [SPECIES_LANDORUS_THERIAN] = 0, [SPECIES_KYUREM] = 0, - [SPECIES_KELDEO] = 0, - [SPECIES_MELOETTA] = 4, + [SPECIES_KYUREM_WHITE] = 0, + [SPECIES_KYUREM_BLACK] = 0, + [SPECIES_KELDEO_ORDINARY] = 0, + [SPECIES_KELDEO_RESOLUTE] = 0, + [SPECIES_MELOETTA_ARIA] = 4, [SPECIES_MELOETTA_PIROUETTE] = 0, [SPECIES_GENESECT] = 2, [SPECIES_GENESECT_DOUSE_DRIVE] = 2, [SPECIES_GENESECT_SHOCK_DRIVE] = 2, [SPECIES_GENESECT_BURN_DRIVE] = 2, [SPECIES_GENESECT_CHILL_DRIVE] = 2, -// Black 2 and White 2 - [SPECIES_TORNADUS_THERIAN] = 1, - [SPECIES_THUNDURUS_THERIAN] = 0, - [SPECIES_LANDORUS_THERIAN] = 0, - [SPECIES_KYUREM_WHITE] = 0, - [SPECIES_KYUREM_BLACK] = 0, - [SPECIES_KELDEO_RESOLUTE] = 0, -// X and Y +// Gen 6 [SPECIES_CHESPIN] = 1, [SPECIES_QUILLADIN] = 1, [SPECIES_CHESNAUGHT] = 1, @@ -2063,6 +2143,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_FROAKIE] = 0, [SPECIES_FROGADIER] = 0, [SPECIES_GRENINJA] = 0, + [SPECIES_GRENINJA_BATTLE_BOND] = 0, + [SPECIES_GRENINJA_ASH] = 0, [SPECIES_BUNNELBY] = 2, [SPECIES_DIGGERSBY] = 2, [SPECIES_FLETCHLING] = 2, @@ -2070,7 +2152,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_TALONFLAME] = 2, [SPECIES_SCATTERBUG] = 1, [SPECIES_SPEWPA] = 1, - [SPECIES_VIVILLON] = 0, + [SPECIES_VIVILLON_ICY_SNOW] = 0, [SPECIES_VIVILLON_POLAR] = 0, [SPECIES_VIVILLON_TUNDRA] = 0, [SPECIES_VIVILLON_CONTINENTAL] = 2, @@ -2092,18 +2174,18 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_VIVILLON_POKE_BALL] = 2, [SPECIES_LITLEO] = 2, [SPECIES_PYROAR] = 2, - [SPECIES_FLABEBE] = 1, + [SPECIES_FLABEBE_RED_FLOWER] = 1, [SPECIES_FLABEBE_YELLOW_FLOWER] = 1, [SPECIES_FLABEBE_ORANGE_FLOWER] = 0, [SPECIES_FLABEBE_BLUE_FLOWER] = 0, [SPECIES_FLABEBE_WHITE_FLOWER] = 1, - [SPECIES_FLOETTE] = 1, + [SPECIES_FLOETTE_RED_FLOWER] = 1, [SPECIES_FLOETTE_YELLOW_FLOWER] = 1, [SPECIES_FLOETTE_ORANGE_FLOWER] = 0, [SPECIES_FLOETTE_BLUE_FLOWER] = 0, [SPECIES_FLOETTE_WHITE_FLOWER] = 1, [SPECIES_FLOETTE_ETERNAL_FLOWER] = 0, - [SPECIES_FLORGES] = 0, + [SPECIES_FLORGES_RED_FLOWER] = 0, [SPECIES_FLORGES_YELLOW_FLOWER] = 1, [SPECIES_FLORGES_ORANGE_FLOWER] = 0, [SPECIES_FLORGES_BLUE_FLOWER] = 0, @@ -2112,7 +2194,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_GOGOAT] = 1, [SPECIES_PANCHAM] = 1, [SPECIES_PANGORO] = 1, - [SPECIES_FURFROU] = 0, + [SPECIES_FURFROU_NATURAL] = 0, [SPECIES_FURFROU_HEART_TRIM] = 0, [SPECIES_FURFROU_STAR_TRIM] = 0, [SPECIES_FURFROU_DIAMOND_TRIM] = 0, @@ -2123,11 +2205,11 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_FURFROU_KABUKI_TRIM] = 0, [SPECIES_FURFROU_PHARAOH_TRIM] = 0, [SPECIES_ESPURR] = 2, - [SPECIES_MEOWSTIC] = 0, + [SPECIES_MEOWSTIC_MALE] = 0, [SPECIES_MEOWSTIC_FEMALE] = 0, [SPECIES_HONEDGE] = 2, [SPECIES_DOUBLADE] = 2, - [SPECIES_AEGISLASH] = 2, + [SPECIES_AEGISLASH_SHIELD] = 2, [SPECIES_AEGISLASH_BLADE] = 2, [SPECIES_SPRITZEE] = 0, [SPECIES_AROMATISSE] = 0, @@ -2153,100 +2235,43 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CARBINK] = 2, [SPECIES_GOOMY] = 5, [SPECIES_SLIGGOO] = 5, + [SPECIES_SLIGGOO_HISUIAN] = 2, [SPECIES_GOODRA] = 5, + [SPECIES_GOODRA_HISUIAN] = 2, [SPECIES_KLEFKI] = 0, [SPECIES_PHANTUMP] = 1, [SPECIES_TREVENANT] = 1, - [SPECIES_PUMPKABOO] = 2, + [SPECIES_PUMPKABOO_AVERAGE] = 2, [SPECIES_PUMPKABOO_SMALL] = 2, [SPECIES_PUMPKABOO_LARGE] = 2, [SPECIES_PUMPKABOO_SUPER] = 2, - [SPECIES_GOURGEIST] = 2, + [SPECIES_GOURGEIST_AVERAGE] = 2, [SPECIES_GOURGEIST_SMALL] = 2, [SPECIES_GOURGEIST_LARGE] = 2, [SPECIES_GOURGEIST_SUPER] = 2, [SPECIES_BERGMITE] = 0, [SPECIES_AVALUGG] = 0, + [SPECIES_AVALUGG_HISUIAN] = 5, [SPECIES_NOIBAT] = 2, [SPECIES_NOIVERN] = 2, - [SPECIES_XERNEAS] = 0, + [SPECIES_XERNEAS_NEUTRAL] = 0, [SPECIES_XERNEAS_ACTIVE] = 0, [SPECIES_YVELTAL] = 0, - [SPECIES_ZYGARDE] = 1, + [SPECIES_ZYGARDE_50] = 1, + [SPECIES_ZYGARDE_10] = 1, + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = 1, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = 1, + [SPECIES_ZYGARDE_COMPLETE] = 1, [SPECIES_DIANCIE] = 1, - [SPECIES_HOOPA] = 0, - [SPECIES_VOLCANION] = 0, - [SPECIES_VENUSAUR_MEGA] = 1, - [SPECIES_CHARIZARD_MEGA_X] = 0, - [SPECIES_CHARIZARD_MEGA_Y] = 0, - [SPECIES_BLASTOISE_MEGA] = 2, - [SPECIES_ALAKAZAM_MEGA] = 2, - [SPECIES_GENGAR_MEGA] = 2, - [SPECIES_KANGASKHAN_MEGA] = 2, - [SPECIES_PINSIR_MEGA] = 2, - [SPECIES_GYARADOS_MEGA] = 0, - [SPECIES_AERODACTYL_MEGA] = 2, - [SPECIES_MEWTWO_MEGA_X] = 2, - [SPECIES_MEWTWO_MEGA_Y] = 2, - [SPECIES_AMPHAROS_MEGA] = 0, - [SPECIES_SCIZOR_MEGA] = 0, - [SPECIES_HERACROSS_MEGA] = 0, - [SPECIES_HOUNDOOM_MEGA] = 0, - [SPECIES_TYRANITAR_MEGA] = 1, - [SPECIES_BLAZIKEN_MEGA] = 0, - [SPECIES_GARDEVOIR_MEGA] = 1, - [SPECIES_MAWILE_MEGA] = 0, - [SPECIES_AGGRON_MEGA] = 2, - [SPECIES_MEDICHAM_MEGA] = 0, - [SPECIES_MANECTRIC_MEGA] = 0, - [SPECIES_BANETTE_MEGA] = 0, - [SPECIES_ABSOL_MEGA] = 0, - [SPECIES_LATIAS_MEGA] = 2, - [SPECIES_LATIOS_MEGA] = 2, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_GARCHOMP_MEGA] = 0, - [SPECIES_LUCARIO_MEGA] = 2, - [SPECIES_ABOMASNOW_MEGA] = 1, - [SPECIES_ARCEUS_FAIRY] = 1, -#endif -// Omega Ruby and Alpha Sapphire - [SPECIES_BEEDRILL_MEGA] = 2, - [SPECIES_PIDGEOT_MEGA] = 0, - [SPECIES_PIKACHU_COSPLAY] = 2, - [SPECIES_PIKACHU_ROCK_STAR] = 1, - [SPECIES_PIKACHU_BELLE] = 0, - [SPECIES_PIKACHU_POP_STAR] = 0, - [SPECIES_PIKACHU_PH_D] = 1, - [SPECIES_PIKACHU_LIBRE] = 0, - [SPECIES_SLOWBRO_MEGA] = 0, - [SPECIES_STEELIX_MEGA] = 0, - [SPECIES_SCEPTILE_MEGA] = 1, - [SPECIES_SWAMPERT_MEGA] = 0, - [SPECIES_SABLEYE_MEGA] = 2, - [SPECIES_SHARPEDO_MEGA] = 0, - [SPECIES_CAMERUPT_MEGA] = 0, - [SPECIES_ALTARIA_MEGA] = 0, - [SPECIES_GLALIE_MEGA] = 0, - [SPECIES_SALAMENCE_MEGA] = 0, - [SPECIES_METAGROSS_MEGA] = 0, - [SPECIES_KYOGRE_PRIMAL] = 0, - [SPECIES_GROUDON_PRIMAL] = 0, - [SPECIES_RAYQUAZA_MEGA] = 1, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_LOPUNNY_MEGA] = 2, - [SPECIES_GALLADE_MEGA] = 1, -#endif -#if P_GEN_5_POKEMON == TRUE - [SPECIES_AUDINO_MEGA] = 1, -#endif -#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = 0, + [SPECIES_HOOPA_CONFINED] = 0, [SPECIES_HOOPA_UNBOUND] = 0, -#endif -// Sun and Moon + [SPECIES_VOLCANION] = 0, +// Gen 7 [SPECIES_ROWLET] = 0, [SPECIES_DARTRIX] = 1, [SPECIES_DECIDUEYE] = 1, + [SPECIES_DECIDUEYE_HISUIAN] = 0, [SPECIES_LITTEN] = 0, [SPECIES_TORRACAT] = 0, [SPECIES_INCINEROAR] = 0, @@ -2263,12 +2288,19 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_VIKAVOLT] = 0, [SPECIES_CRABRAWLER] = 2, [SPECIES_CRABOMINABLE] = 2, - [SPECIES_ORICORIO] = 0, + [SPECIES_ORICORIO_BAILE] = 0, + [SPECIES_ORICORIO_POM_POM] = 1, + [SPECIES_ORICORIO_PAU] = 1, + [SPECIES_ORICORIO_SENSU] = 0, [SPECIES_CUTIEFLY] = 2, [SPECIES_RIBOMBEE] = 2, [SPECIES_ROCKRUFF] = 2, - [SPECIES_LYCANROC] = 2, - [SPECIES_WISHIWASHI] = 2, + [SPECIES_ROCKRUFF_OWN_TEMPO] = 2, + [SPECIES_LYCANROC_MIDDAY] = 2, + [SPECIES_LYCANROC_MIDNIGHT] = 0, + [SPECIES_LYCANROC_DUSK] = 0, + [SPECIES_WISHIWASHI_SOLO] = 2, + [SPECIES_WISHIWASHI_SCHOOL] = 0, [SPECIES_MAREANIE] = 2, [SPECIES_TOXAPEX] = 0, [SPECIES_MUDBRAY] = 2, @@ -2295,12 +2327,43 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_PALOSSAND] = 2, [SPECIES_PYUKUMUKU] = 0, [SPECIES_TYPE_NULL] = 0, - [SPECIES_SILVALLY] = 0, - [SPECIES_MINIOR] = 2, + [SPECIES_SILVALLY_NORMAL] = 0, + [SPECIES_SILVALLY_FIGHTING] = 0, + [SPECIES_SILVALLY_FLYING] = 0, + [SPECIES_SILVALLY_POISON] = 0, + [SPECIES_SILVALLY_GROUND] = 0, + [SPECIES_SILVALLY_ROCK] = 0, + [SPECIES_SILVALLY_BUG] = 0, + [SPECIES_SILVALLY_GHOST] = 0, + [SPECIES_SILVALLY_STEEL] = 0, + [SPECIES_SILVALLY_FIRE] = 0, + [SPECIES_SILVALLY_WATER] = 0, + [SPECIES_SILVALLY_GRASS] = 0, + [SPECIES_SILVALLY_ELECTRIC] = 0, + [SPECIES_SILVALLY_PSYCHIC] = 0, + [SPECIES_SILVALLY_ICE] = 0, + [SPECIES_SILVALLY_DRAGON] = 0, + [SPECIES_SILVALLY_DARK] = 0, + [SPECIES_SILVALLY_FAIRY] = 0, + [SPECIES_MINIOR_METEOR_RED] = 2, + [SPECIES_MINIOR_METEOR_ORANGE] = 2, + [SPECIES_MINIOR_METEOR_YELLOW] = 2, + [SPECIES_MINIOR_METEOR_GREEN] = 2, + [SPECIES_MINIOR_METEOR_BLUE] = 2, + [SPECIES_MINIOR_METEOR_INDIGO] = 2, + [SPECIES_MINIOR_METEOR_VIOLET] = 2, + [SPECIES_MINIOR_CORE_RED] = 0, + [SPECIES_MINIOR_CORE_ORANGE] = 0, + [SPECIES_MINIOR_CORE_YELLOW] = 0, + [SPECIES_MINIOR_CORE_GREEN] = 1, + [SPECIES_MINIOR_CORE_BLUE] = 0, + [SPECIES_MINIOR_CORE_INDIGO] = 0, + [SPECIES_MINIOR_CORE_VIOLET] = 2, [SPECIES_KOMALA] = 2, [SPECIES_TURTONATOR] = 0, [SPECIES_TOGEDEMARU] = 2, - [SPECIES_MIMIKYU] = 1, + [SPECIES_MIMIKYU_DISGUISED] = 1, + [SPECIES_MIMIKYU_BUSTED] = 1, [SPECIES_BRUXISH] = 0, [SPECIES_DRAMPA] = 0, [SPECIES_DHELMISE] = 1, @@ -2323,7 +2386,11 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_KARTANA] = 0, [SPECIES_GUZZLORD] = 0, [SPECIES_NECROZMA] = 0, + [SPECIES_NECROZMA_DUSK_MANE] = 0, + [SPECIES_NECROZMA_DAWN_WINGS] = 0, + [SPECIES_NECROZMA_ULTRA] = 2, [SPECIES_MAGEARNA] = 0, + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = 0, [SPECIES_MARSHADOW] = 0, [SPECIES_POIPOLE] = 0, [SPECIES_NAGANADEL] = 0, @@ -2368,16 +2435,21 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SILICOBRA] = 1, [SPECIES_SANDACONDA] = 1, [SPECIES_CRAMORANT] = 0, + [SPECIES_CRAMORANT_GULPING] = 0, + [SPECIES_CRAMORANT_GORGING] = 0, [SPECIES_ARROKUDA] = 2, [SPECIES_BARRASKEWDA] = 2, [SPECIES_TOXEL] = 2, - [SPECIES_TOXTRICITY] = 2, + [SPECIES_TOXTRICITY_AMPED] = 2, + [SPECIES_TOXTRICITY_LOW_KEY] = 2, [SPECIES_SIZZLIPEDE] = 0, [SPECIES_CENTISKORCH] = 0, [SPECIES_CLOBBOPUS] = 0, [SPECIES_GRAPPLOCT] = 2, - [SPECIES_SINISTEA] = 2, - [SPECIES_POLTEAGEIST] = 2, + [SPECIES_SINISTEA_PHONY] = 2, + [SPECIES_SINISTEA_ANTIQUE] = 2, + [SPECIES_POLTEAGEIST_PHONY] = 2, + [SPECIES_POLTEAGEIST_ANTIQUE] = 2, [SPECIES_HATENNA] = 0, [SPECIES_HATTREM] = 0, [SPECIES_HATTERENE] = 0, @@ -2391,15 +2463,26 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MR_RIME] = 0, [SPECIES_RUNERIGUS] = 2, [SPECIES_MILCERY] = 1, - [SPECIES_ALCREMIE] = 1, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = 1, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = 0, [SPECIES_FALINKS] = 0, [SPECIES_PINCURCHIN] = 0, [SPECIES_SNOM] = 0, [SPECIES_FROSMOTH] = 0, [SPECIES_STONJOURNER] = 2, - [SPECIES_EISCUE] = 0, - [SPECIES_INDEEDEE] = 2, - [SPECIES_MORPEKO] = 2, + [SPECIES_EISCUE_ICE_FACE] = 0, + [SPECIES_EISCUE_NOICE_FACE] = 0, + [SPECIES_INDEEDEE_MALE] = 2, + [SPECIES_INDEEDEE_FEMALE] = 2, + [SPECIES_MORPEKO_FULL_BELLY] = 2, + [SPECIES_MORPEKO_HANGRY] = 2, [SPECIES_CUFANT] = 0, [SPECIES_COPPERAJAH] = 0, [SPECIES_DRACOZOLT] = 1, @@ -2410,17 +2493,24 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DREEPY] = 0, [SPECIES_DRAKLOAK] = 0, [SPECIES_DRAGAPULT] = 0, - [SPECIES_ZACIAN] = 2, - [SPECIES_ZAMAZENTA] = 2, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = 2, + [SPECIES_ZACIAN_CROWNED_SWORD] = 2, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = 2, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = 2, [SPECIES_ETERNATUS] = 0, + [SPECIES_ETERNATUS_ETERNAMAX] = 0, [SPECIES_KUBFU] = 1, - [SPECIES_URSHIFU] = 2, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = 2, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = 2, [SPECIES_ZARUDE] = 1, + [SPECIES_ZARUDE_DADA] = 1, [SPECIES_REGIELEKI] = 0, [SPECIES_REGIDRAGO] = 0, [SPECIES_GLASTRIER] = 0, [SPECIES_SPECTRIER] = 0, [SPECIES_CALYREX] = 0, + [SPECIES_CALYREX_ICE_RIDER] = 0, + [SPECIES_CALYREX_SHADOW_RIDER] = 0, [SPECIES_WYRDEER] = 2, [SPECIES_KLEAVOR] = 2, [SPECIES_URSALUNA] = 2, @@ -2428,153 +2518,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SNEASLER] = 2, [SPECIES_OVERQWIL] = 2, [SPECIES_ENAMORUS] = 1, - - - [SPECIES_RATTATA_ALOLAN] = 2, - [SPECIES_RATICATE_ALOLAN] = 2, - [SPECIES_RAICHU_ALOLAN] = 2, - [SPECIES_SANDSHREW_ALOLAN] = 0, - [SPECIES_SANDSLASH_ALOLAN] = 0, - [SPECIES_VULPIX_ALOLAN] = 2, - [SPECIES_NINETALES_ALOLAN] = 2, - [SPECIES_DIGLETT_ALOLAN] = 2, - [SPECIES_DUGTRIO_ALOLAN] = 2, - [SPECIES_MEOWTH_ALOLAN] = 2, - [SPECIES_PERSIAN_ALOLAN] = 2, - [SPECIES_GEODUDE_ALOLAN] = 2, - [SPECIES_GRAVELER_ALOLAN] = 2, - [SPECIES_GOLEM_ALOLAN] = 2, - [SPECIES_GRIMER_ALOLAN] = 1, - [SPECIES_MUK_ALOLAN] = 0, - [SPECIES_EXEGGUTOR_ALOLAN] = 1, - [SPECIES_MAROWAK_ALOLAN] = 1, - [SPECIES_MEOWTH_GALARIAN] = 0, - [SPECIES_PONYTA_GALARIAN] = 2, - [SPECIES_RAPIDASH_GALARIAN] = 2, - [SPECIES_SLOWPOKE_GALARIAN] = 1, - [SPECIES_SLOWBRO_GALARIAN] = 0, - [SPECIES_FARFETCHD_GALARIAN] = 1, - [SPECIES_WEEZING_GALARIAN] = 1, - [SPECIES_MR_MIME_GALARIAN] = 0, - [SPECIES_ARTICUNO_GALARIAN] = 2, - [SPECIES_ZAPDOS_GALARIAN] = 0, - [SPECIES_MOLTRES_GALARIAN] = 0, - [SPECIES_SLOWKING_GALARIAN] = 2, - [SPECIES_CORSOLA_GALARIAN] = 0, - [SPECIES_ZIGZAGOON_GALARIAN] = 0, - [SPECIES_LINOONE_GALARIAN] = 0, - [SPECIES_DARUMAKA_GALARIAN] = 0, - [SPECIES_DARMANITAN_GALARIAN] = 0, - [SPECIES_YAMASK_GALARIAN] = 2, - [SPECIES_STUNFISK_GALARIAN] = 1, - [SPECIES_GROWLITHE_HISUIAN] = 0, - [SPECIES_ARCANINE_HISUIAN] = 0, - [SPECIES_VOLTORB_HISUIAN] = 0, - [SPECIES_ELECTRODE_HISUIAN] = 1, - [SPECIES_TYPHLOSION_HISUIAN] = 1, - [SPECIES_QWILFISH_HISUIAN] = 0, - [SPECIES_SNEASEL_HISUIAN] = 2, - [SPECIES_SAMUROTT_HISUIAN] = 0, - [SPECIES_LILLIGANT_HISUIAN] = 1, - [SPECIES_ZORUA_HISUIAN] = 0, - [SPECIES_ZOROARK_HISUIAN] = 0, - [SPECIES_BRAVIARY_HISUIAN] = 2, - [SPECIES_SLIGGOO_HISUIAN] = 2, - [SPECIES_GOODRA_HISUIAN] = 2, - [SPECIES_AVALUGG_HISUIAN] = 5, - [SPECIES_DECIDUEYE_HISUIAN] = 0, - [SPECIES_PIKACHU_ORIGINAL_CAP] = 0, - [SPECIES_PIKACHU_HOENN_CAP] = 0, - [SPECIES_PIKACHU_SINNOH_CAP] = 0, - [SPECIES_PIKACHU_UNOVA_CAP] = 0, - [SPECIES_PIKACHU_KALOS_CAP] = 0, - [SPECIES_PIKACHU_ALOLA_CAP] = 0, - [SPECIES_PIKACHU_PARTNER_CAP] = 0, - [SPECIES_PIKACHU_WORLD_CAP] = 0, -#if P_GEN_4_POKEMON == TRUE - [SPECIES_DIALGA_ORIGIN] = 0, - [SPECIES_PALKIA_ORIGIN] = 2, -#endif -#if P_GEN_5_POKEMON == TRUE - - [SPECIES_BASCULIN_WHITE_STRIPED] = 0, - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = 0, - -#endif -#if P_GEN_6_POKEMON == TRUE - [SPECIES_GRENINJA_BATTLE_BOND] = 0, - [SPECIES_GRENINJA_ASH] = 0, - - - [SPECIES_ZYGARDE_10] = 1, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = 1, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = 1, - [SPECIES_ZYGARDE_COMPLETE] = 1, -#endif -#if P_GEN_7_POKEMON == TRUE - [SPECIES_ORICORIO_POM_POM] = 1, - [SPECIES_ORICORIO_PAU] = 1, - [SPECIES_ORICORIO_SENSU] = 0, - [SPECIES_ROCKRUFF_OWN_TEMPO] = 2, - [SPECIES_LYCANROC_MIDNIGHT] = 0, - [SPECIES_LYCANROC_DUSK] = 0, - [SPECIES_WISHIWASHI_SCHOOL] = 0, - [SPECIES_SILVALLY_FIGHTING] = 0, - [SPECIES_SILVALLY_FLYING] = 0, - [SPECIES_SILVALLY_POISON] = 0, - [SPECIES_SILVALLY_GROUND] = 0, - [SPECIES_SILVALLY_ROCK] = 0, - [SPECIES_SILVALLY_BUG] = 0, - [SPECIES_SILVALLY_GHOST] = 0, - [SPECIES_SILVALLY_STEEL] = 0, - [SPECIES_SILVALLY_FIRE] = 0, - [SPECIES_SILVALLY_WATER] = 0, - [SPECIES_SILVALLY_GRASS] = 0, - [SPECIES_SILVALLY_ELECTRIC] = 0, - [SPECIES_SILVALLY_PSYCHIC] = 0, - [SPECIES_SILVALLY_ICE] = 0, - [SPECIES_SILVALLY_DRAGON] = 0, - [SPECIES_SILVALLY_DARK] = 0, - [SPECIES_SILVALLY_FAIRY] = 0, - [SPECIES_MINIOR_CORE_RED] = 0, - [SPECIES_MINIOR_CORE_ORANGE] = 0, - [SPECIES_MINIOR_CORE_YELLOW] = 0, - [SPECIES_MINIOR_CORE_GREEN] = 1, - [SPECIES_MINIOR_CORE_BLUE] = 0, - [SPECIES_MINIOR_CORE_INDIGO] = 0, - [SPECIES_MINIOR_CORE_VIOLET] = 2, - [SPECIES_MIMIKYU_BUSTED] = 1, - [SPECIES_NECROZMA_DUSK_MANE] = 0, - [SPECIES_NECROZMA_DAWN_WINGS] = 0, - [SPECIES_NECROZMA_ULTRA] = 2, - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = 0, -#endif -#if P_GEN_8_POKEMON == TRUE - [SPECIES_CRAMORANT_GULPING] = 0, - [SPECIES_CRAMORANT_GORGING] = 0, - [SPECIES_TOXTRICITY_LOW_KEY] = 2, - [SPECIES_SINISTEA_ANTIQUE] = 2, - [SPECIES_POLTEAGEIST_ANTIQUE] = 2, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = 0, - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = 0, - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = 0, - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = 0, - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = 0, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = 0, - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = 0, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = 0, - [SPECIES_EISCUE_NOICE_FACE] = 0, - [SPECIES_INDEEDEE_FEMALE] = 2, - [SPECIES_MORPEKO_HANGRY] = 2, - [SPECIES_ZACIAN_CROWNED_SWORD] = 2, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = 2, - [SPECIES_ETERNATUS_ETERNAMAX] = 0, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = 2, - [SPECIES_ZARUDE_DADA] = 1, - [SPECIES_CALYREX_ICE_RIDER] = 0, - [SPECIES_CALYREX_SHADOW_RIDER] = 0, [SPECIES_ENAMORUS_THERIAN] = 1, -#endif [SPECIES_EGG] = 1, }; diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index a31a81b27d..beea6646e5 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -605,7 +605,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_CINCCINO, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_GOTHITA, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_GOTHORITA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_DEERLING, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DEERLING_SPRING, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_DEERLING_SUMMER, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_DEERLING_AUTUMN, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_DEERLING_WINTER, .jumpType = JUMP_TYPE_FAST, }, @@ -632,7 +632,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_LITLEO, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_PANCHAM, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_ESPURR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MEOWSTIC, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWSTIC_MALE, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_MEOWSTIC_FEMALE, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_BINACLE, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_CLAUNCHER, .jumpType = JUMP_TYPE_SLOW, }, @@ -664,7 +664,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_PYUKUMUKU, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_KOMALA, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_TOGEDEMARU, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MIMIKYU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MIMIKYU_DISGUISED, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_MIMIKYU_BUSTED, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_JANGMO_O, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_MARSHADOW, .jumpType = JUMP_TYPE_SLOW, }, @@ -694,7 +694,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_HATENNA, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_HATTREM, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_IMPIDIMP, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_ALCREMIE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM, .jumpType = JUMP_TYPE_SLOW, }, @@ -705,7 +705,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_PINCURCHIN, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_SNOM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MORPEKO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MORPEKO_FULL_BELLY, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_MORPEKO_HANGRY, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_KUBFU, .jumpType = JUMP_TYPE_FAST, }, };