More reordering, using form constants
This commit is contained in:
parent
41774f49ed
commit
eda1dce876
24 changed files with 4744 additions and 5577 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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},
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -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
|
||||
};
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -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,
|
||||
};
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -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)
|
||||
|
|
830
src/pokemon.c
830
src/pokemon.c
File diff suppressed because it is too large
Load diff
1044
src/pokemon_icon.c
1044
src/pokemon_icon.c
File diff suppressed because it is too large
Load diff
|
@ -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, },
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue