Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated species defines (#5075)

Browse Source 
* First version of new defines

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Removed old defines

* Removed old defines

* Removed old defines and cleaned up some macros

* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs

* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599

* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
This commit is contained in:
psf 2024-10-02 14:24:57 -07:00 committed by GitHub
parent 7852dc3e47
commit 2597d8a35a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
55 changed files with 934 additions and 1064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/constants/cries.h
View File

@ -1636,7 +1636,7 @@ enum {
#if P_FAMILY_FLABEBE
CRY_FLABEBE,
CRY_FLOETTE,
CRY_FLOETTE_ETERNAL_FLOWER,
CRY_FLOETTE_ETERNAL,
CRY_FLORGES,
#endif //P_FAMILY_FLABEBE
#if P_FAMILY_SKIDDO
@ -2084,12 +2084,12 @@ enum {
CRY_STONJOURNER,
#endif //P_FAMILY_STONJOURNER
#if P_FAMILY_EISCUE
CRY_EISCUE_ICE_FACE,
CRY_EISCUE_ICE,
CRY_EISCUE_NOICE_FACE,
#endif //P_FAMILY_EISCUE
#if P_FAMILY_INDEEDEE
CRY_INDEEDEE_MALE,
CRY_INDEEDEE_FEMALE,
CRY_INDEEDEE_M,
CRY_INDEEDEE_F,
#endif //P_FAMILY_INDEEDEE
#if P_FAMILY_MORPEKO
CRY_MORPEKO_FULL_BELLY,
@ -2123,11 +2123,11 @@ enum {
CRY_DRAGAPULT,
#endif //P_FAMILY_DREEPY
#if P_FAMILY_ZACIAN
CRY_ZACIAN_HERO_OF_MANY_BATTLES,
CRY_ZACIAN_HERO,
CRY_ZACIAN_CROWNED_SWORD,
#endif //P_FAMILY_ZACIAN
#if P_FAMILY_ZAMAZENTA
CRY_ZAMAZENTA_HERO_OF_MANY_BATTLES,
CRY_ZAMAZENTA_HERO,
CRY_ZAMAZENTA_CROWNED_SHIELD,
#endif //P_FAMILY_ZAMAZENTA
#if P_FAMILY_ETERNATUS
@ -2182,8 +2182,8 @@ enum {
#endif //P_FAMILY_QUAXLY
#if P_FAMILY_LECHONK
CRY_LECHONK,
CRY_OINKOLOGNE_MALE,
CRY_OINKOLOGNE_FEMALE,
CRY_OINKOLOGNE_M,
CRY_OINKOLOGNE_F,
#endif //P_FAMILY_LECHONK
#if P_FAMILY_TAROUNTULA
CRY_TAROUNTULA,

554
include/constants/species.h
View File

@ -1,6 +1,11 @@
#ifndef GUARD_CONSTANTS_SPECIES_H
#define GUARD_CONSTANTS_SPECIES_H
// NOTE: The defines here are named in order to match Pokémon Showdown's naming conventions. This is done to avoid issues with trainerproc parsing species names. If a Pokémon does not have an entry on Showdown, use your best judgement.
// Additionally, we have tried to reduce down to as few defines as possible, because programs like porymap does not always properly handle having multiple defines.
// Discussion: https://github.com/rh-hideout/pokeemerald-expansion/pull/5075#issuecomment-2384088602
// Showdown: https://github.com/smogon/Pokemon-Showdown/blob/master/data/pokedex.ts
#define SPECIES_NONE 0
#define SPECIES_BULBASAUR 1
#define SPECIES_IVYSAUR 2
@ -415,12 +420,12 @@
#define SPECIES_RAMPARDOS 409
#define SPECIES_SHIELDON 410
#define SPECIES_BASTIODON 411
#define SPECIES_BURMY SPECIES_BURMY_PLANT_CLOAK
#define SPECIES_BURMY_PLANT_CLOAK 412
#define SPECIES_WORMADAM SPECIES_WORMADAM_PLANT_CLOAK
#define SPECIES_WORMADAM_PLANT_CLOAK 413
#define SPECIES_MOTHIM SPECIES_MOTHIM_PLANT_CLOAK
#define SPECIES_MOTHIM_PLANT_CLOAK 414
#define SPECIES_BURMY_PLANT 412
#define SPECIES_BURMY SPECIES_BURMY_PLANT
#define SPECIES_WORMADAM_PLANT 413
#define SPECIES_WORMADAM SPECIES_WORMADAM_PLANT
#define SPECIES_MOTHIM_PLANT 414
#define SPECIES_MOTHIM SPECIES_MOTHIM_PLANT
#define SPECIES_COMBEE 415
#define SPECIES_VESPIQUEN 416
#define SPECIES_PACHIRISU 417
@ -429,10 +434,10 @@
#define SPECIES_CHERUBI 420
#define SPECIES_CHERRIM SPECIES_CHERRIM_OVERCAST
#define SPECIES_CHERRIM_OVERCAST 421
#define SPECIES_SHELLOS SPECIES_SHELLOS_WEST_SEA
#define SPECIES_SHELLOS_WEST_SEA 422
#define SPECIES_GASTRODON SPECIES_GASTRODON_WEST_SEA
#define SPECIES_GASTRODON_WEST_SEA 423
#define SPECIES_SHELLOS_WEST 422
#define SPECIES_SHELLOS SPECIES_SHELLOS_WEST
#define SPECIES_GASTRODON_WEST 423
#define SPECIES_GASTRODON SPECIES_GASTRODON_WEST
#define SPECIES_AMBIPOM 424
#define SPECIES_DRIFLOON 425
#define SPECIES_DRIFBLIM 426
@ -568,8 +573,8 @@
#define SPECIES_KROKOROK 552
#define SPECIES_KROOKODILE 553
#define SPECIES_DARUMAKA 554
#define SPECIES_DARMANITAN SPECIES_DARMANITAN_STANDARD_MODE
#define SPECIES_DARMANITAN_STANDARD_MODE 555
#define SPECIES_DARMANITAN SPECIES_DARMANITAN_STANDARD
#define SPECIES_DARMANITAN_STANDARD 555
#define SPECIES_MARACTUS 556
#define SPECIES_DWEBBLE 557
#define SPECIES_CRUSTLE 558
@ -693,12 +698,12 @@
#define SPECIES_VIVILLON_ICY_SNOW 666
#define SPECIES_LITLEO 667
#define SPECIES_PYROAR 668
#define SPECIES_FLABEBE SPECIES_FLABEBE_RED_FLOWER
#define SPECIES_FLABEBE_RED_FLOWER 669
#define SPECIES_FLOETTE SPECIES_FLOETTE_RED_FLOWER
#define SPECIES_FLOETTE_RED_FLOWER 670
#define SPECIES_FLORGES SPECIES_FLORGES_RED_FLOWER
#define SPECIES_FLORGES_RED_FLOWER 671
#define SPECIES_FLABEBE SPECIES_FLABEBE_RED
#define SPECIES_FLABEBE_RED 669
#define SPECIES_FLOETTE SPECIES_FLOETTE_RED
#define SPECIES_FLOETTE_RED 670
#define SPECIES_FLORGES SPECIES_FLORGES_RED
#define SPECIES_FLORGES_RED 671
#define SPECIES_SKIDDO 672
#define SPECIES_GOGOAT 673
#define SPECIES_PANCHAM 674
@ -706,8 +711,8 @@
#define SPECIES_FURFROU SPECIES_FURFROU_NATURAL
#define SPECIES_FURFROU_NATURAL 676
#define SPECIES_ESPURR 677
#define SPECIES_MEOWSTIC SPECIES_MEOWSTIC_MALE
#define SPECIES_MEOWSTIC_MALE 678
#define SPECIES_MEOWSTIC SPECIES_MEOWSTIC_M
#define SPECIES_MEOWSTIC_M 678
#define SPECIES_HONEDGE 679
#define SPECIES_DOUBLADE 680
#define SPECIES_AEGISLASH SPECIES_AEGISLASH_SHIELD
@ -752,8 +757,7 @@
#define SPECIES_XERNEAS_NEUTRAL 716
#define SPECIES_YVELTAL 717
#define SPECIES_ZYGARDE SPECIES_ZYGARDE_50
#define SPECIES_ZYGARDE_50 SPECIES_ZYGARDE_50_AURA_BREAK
#define SPECIES_ZYGARDE_50_AURA_BREAK 718
#define SPECIES_ZYGARDE_50 718
#define SPECIES_DIANCIE 719
#define SPECIES_HOOPA SPECIES_HOOPA_CONFINED
#define SPECIES_HOOPA_CONFINED 720
@ -925,10 +929,10 @@
#define SPECIES_SNOM 872
#define SPECIES_FROSMOTH 873
#define SPECIES_STONJOURNER 874
#define SPECIES_EISCUE SPECIES_EISCUE_ICE_FACE
#define SPECIES_EISCUE_ICE_FACE 875
#define SPECIES_INDEEDEE SPECIES_INDEEDEE_MALE
#define SPECIES_INDEEDEE_MALE 876
#define SPECIES_EISCUE SPECIES_EISCUE_ICE
#define SPECIES_EISCUE_ICE 875
#define SPECIES_INDEEDEE SPECIES_INDEEDEE_M
#define SPECIES_INDEEDEE_M 876
#define SPECIES_MORPEKO SPECIES_MORPEKO_FULL_BELLY
#define SPECIES_MORPEKO_FULL_BELLY 877
#define SPECIES_CUFANT 878
@ -941,14 +945,14 @@
#define SPECIES_DREEPY 885
#define SPECIES_DRAKLOAK 886
#define SPECIES_DRAGAPULT 887
#define SPECIES_ZACIAN SPECIES_ZACIAN_HERO_OF_MANY_BATTLES
#define SPECIES_ZACIAN_HERO_OF_MANY_BATTLES 888
#define SPECIES_ZAMAZENTA SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES
#define SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES 889
#define SPECIES_ZACIAN SPECIES_ZACIAN_HERO
#define SPECIES_ZACIAN_HERO 888
#define SPECIES_ZAMAZENTA SPECIES_ZAMAZENTA_HERO
#define SPECIES_ZAMAZENTA_HERO 889
#define SPECIES_ETERNATUS 890
#define SPECIES_KUBFU 891
#define SPECIES_URSHIFU SPECIES_URSHIFU_SINGLE_STRIKE_STYLE
#define SPECIES_URSHIFU_SINGLE_STRIKE_STYLE 892
#define SPECIES_URSHIFU SPECIES_URSHIFU_SINGLE_STRIKE
#define SPECIES_URSHIFU_SINGLE_STRIKE 892
#define SPECIES_ZARUDE 893
#define SPECIES_REGIELEKI 894
#define SPECIES_REGIDRAGO 895
@ -958,8 +962,8 @@
#define SPECIES_WYRDEER 899
#define SPECIES_KLEAVOR 900
#define SPECIES_URSALUNA 901
#define SPECIES_BASCULEGION SPECIES_BASCULEGION_MALE
#define SPECIES_BASCULEGION_MALE 902
#define SPECIES_BASCULEGION SPECIES_BASCULEGION_M
#define SPECIES_BASCULEGION_M 902
#define SPECIES_SNEASLER 903
#define SPECIES_OVERQWIL 904
#define SPECIES_ENAMORUS SPECIES_ENAMORUS_INCARNATE
@ -1014,78 +1018,78 @@
#define SPECIES_RAYQUAZA_MEGA 953
#define SPECIES_KYOGRE_PRIMAL 954
#define SPECIES_GROUDON_PRIMAL 955
#define SPECIES_RATTATA_ALOLAN 956
#define SPECIES_RATICATE_ALOLAN 957
#define SPECIES_RAICHU_ALOLAN 958
#define SPECIES_SANDSHREW_ALOLAN 959
#define SPECIES_SANDSLASH_ALOLAN 960
#define SPECIES_VULPIX_ALOLAN 961
#define SPECIES_NINETALES_ALOLAN 962
#define SPECIES_DIGLETT_ALOLAN 963
#define SPECIES_DUGTRIO_ALOLAN 964
#define SPECIES_MEOWTH_ALOLAN 965
#define SPECIES_PERSIAN_ALOLAN 966
#define SPECIES_GEODUDE_ALOLAN 967
#define SPECIES_GRAVELER_ALOLAN 968
#define SPECIES_GOLEM_ALOLAN 969
#define SPECIES_GRIMER_ALOLAN 970
#define SPECIES_MUK_ALOLAN 971
#define SPECIES_EXEGGUTOR_ALOLAN 972
#define SPECIES_MAROWAK_ALOLAN 973
#define SPECIES_MEOWTH_GALARIAN 974
#define SPECIES_PONYTA_GALARIAN 975
#define SPECIES_RAPIDASH_GALARIAN 976
#define SPECIES_SLOWPOKE_GALARIAN 977
#define SPECIES_SLOWBRO_GALARIAN 978
#define SPECIES_FARFETCHD_GALARIAN 979
#define SPECIES_WEEZING_GALARIAN 980
#define SPECIES_MR_MIME_GALARIAN 981
#define SPECIES_ARTICUNO_GALARIAN 982
#define SPECIES_ZAPDOS_GALARIAN 983
#define SPECIES_MOLTRES_GALARIAN 984
#define SPECIES_SLOWKING_GALARIAN 985
#define SPECIES_CORSOLA_GALARIAN 986
#define SPECIES_ZIGZAGOON_GALARIAN 987
#define SPECIES_LINOONE_GALARIAN 988
#define SPECIES_DARUMAKA_GALARIAN 989
#define SPECIES_DARMANITAN_GALARIAN SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE
#define SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE 990
#define SPECIES_YAMASK_GALARIAN 991
#define SPECIES_STUNFISK_GALARIAN 992
#define SPECIES_RATTATA_ALOLA 956
#define SPECIES_RATICATE_ALOLA 957
#define SPECIES_RAICHU_ALOLA 958
#define SPECIES_SANDSHREW_ALOLA 959
#define SPECIES_SANDSLASH_ALOLA 960
#define SPECIES_VULPIX_ALOLA 961
#define SPECIES_NINETALES_ALOLA 962
#define SPECIES_DIGLETT_ALOLA 963
#define SPECIES_DUGTRIO_ALOLA 964
#define SPECIES_MEOWTH_ALOLA 965
#define SPECIES_PERSIAN_ALOLA 966
#define SPECIES_GEODUDE_ALOLA 967
#define SPECIES_GRAVELER_ALOLA 968
#define SPECIES_GOLEM_ALOLA 969
#define SPECIES_GRIMER_ALOLA 970
#define SPECIES_MUK_ALOLA 971
#define SPECIES_EXEGGUTOR_ALOLA 972
#define SPECIES_MAROWAK_ALOLA 973
#define SPECIES_MEOWTH_GALAR 974
#define SPECIES_PONYTA_GALAR 975
#define SPECIES_RAPIDASH_GALAR 976
#define SPECIES_SLOWPOKE_GALAR 977
#define SPECIES_SLOWBRO_GALAR 978
#define SPECIES_FARFETCHD_GALAR 979
#define SPECIES_WEEZING_GALAR 980
#define SPECIES_MR_MIME_GALAR 981
#define SPECIES_ARTICUNO_GALAR 982
#define SPECIES_ZAPDOS_GALAR 983
#define SPECIES_MOLTRES_GALAR 984
#define SPECIES_SLOWKING_GALAR 985
#define SPECIES_CORSOLA_GALAR 986
#define SPECIES_ZIGZAGOON_GALAR 987
#define SPECIES_LINOONE_GALAR 988
#define SPECIES_DARUMAKA_GALAR 989
#define SPECIES_DARMANITAN_GALAR_STANDARD 990
#define SPECIES_DARMANITAN_GALAR SPECIES_DARMANITAN_GALAR_STANDARD
#define SPECIES_YAMASK_GALAR 991
#define SPECIES_STUNFISK_GALAR 992
//Hisuian Forms
#define SPECIES_GROWLITHE_HISUIAN 993
#define SPECIES_ARCANINE_HISUIAN 994
#define SPECIES_VOLTORB_HISUIAN 995
#define SPECIES_ELECTRODE_HISUIAN 996
#define SPECIES_TYPHLOSION_HISUIAN 997
#define SPECIES_QWILFISH_HISUIAN 998
#define SPECIES_SNEASEL_HISUIAN 999
#define SPECIES_SAMUROTT_HISUIAN 1000
#define SPECIES_LILLIGANT_HISUIAN 1001
#define SPECIES_ZORUA_HISUIAN 1002
#define SPECIES_ZOROARK_HISUIAN 1003
#define SPECIES_BRAVIARY_HISUIAN 1004
#define SPECIES_SLIGGOO_HISUIAN 1005
#define SPECIES_GOODRA_HISUIAN 1006
#define SPECIES_AVALUGG_HISUIAN 1007
#define SPECIES_DECIDUEYE_HISUIAN 1008
#define SPECIES_GROWLITHE_HISUI 993
#define SPECIES_ARCANINE_HISUI 994
#define SPECIES_VOLTORB_HISUI 995
#define SPECIES_ELECTRODE_HISUI 996
#define SPECIES_TYPHLOSION_HISUI 997
#define SPECIES_QWILFISH_HISUI 998
#define SPECIES_SNEASEL_HISUI 999
#define SPECIES_SAMUROTT_HISUI 1000
#define SPECIES_LILLIGANT_HISUI 1001
#define SPECIES_ZORUA_HISUI 1002
#define SPECIES_ZOROARK_HISUI 1003
#define SPECIES_BRAVIARY_HISUI 1004
#define SPECIES_SLIGGOO_HISUI 1005
#define SPECIES_GOODRA_HISUI 1006
#define SPECIES_AVALUGG_HISUI 1007
#define SPECIES_DECIDUEYE_HISUI 1008
// Misc Forms
#define SPECIES_PIKACHU_COSPLAY 1009
#define SPECIES_PIKACHU_ROCK_STAR 1010
#define SPECIES_PIKACHU_BELLE 1011
#define SPECIES_PIKACHU_POP_STAR 1012
#define SPECIES_PIKACHU_PH_D 1013
#define SPECIES_PIKACHU_PHD 1013
#define SPECIES_PIKACHU_LIBRE 1014
#define SPECIES_PIKACHU_ORIGINAL_CAP 1015
#define SPECIES_PIKACHU_HOENN_CAP 1016
#define SPECIES_PIKACHU_SINNOH_CAP 1017
#define SPECIES_PIKACHU_UNOVA_CAP 1018
#define SPECIES_PIKACHU_KALOS_CAP 1019
#define SPECIES_PIKACHU_ALOLA_CAP 1020
#define SPECIES_PIKACHU_ORIGINAL 1015
#define SPECIES_PIKACHU_HOENN 1016
#define SPECIES_PIKACHU_SINNOH 1017
#define SPECIES_PIKACHU_UNOVA 1018
#define SPECIES_PIKACHU_KALOS 1019
#define SPECIES_PIKACHU_ALOLA 1020
#define SPECIES_PIKACHU_PARTNER_CAP 1021
#define SPECIES_PIKACHU_WORLD_CAP 1022
#define SPECIES_PIKACHU_WORLD 1022
#define SPECIES_PICHU_SPIKY_EARED 1023
#define SPECIES_UNOWN_B 1024
#define SPECIES_UNOWN_C 1025
@ -1112,21 +1116,21 @@
#define SPECIES_UNOWN_X 1046
#define SPECIES_UNOWN_Y 1047
#define SPECIES_UNOWN_Z 1048
#define SPECIES_UNOWN_EMARK 1049
#define SPECIES_UNOWN_QMARK 1050
#define SPECIES_UNOWN_EXCLAMATION 1049
#define SPECIES_UNOWN_QUESTION 1050
#define SPECIES_CASTFORM_SUNNY 1051
#define SPECIES_CASTFORM_RAINY 1052
#define SPECIES_CASTFORM_SNOWY 1053
#define SPECIES_DEOXYS_ATTACK 1054
#define SPECIES_DEOXYS_DEFENSE 1055
#define SPECIES_DEOXYS_SPEED 1056
#define SPECIES_BURMY_SANDY_CLOAK 1057
#define SPECIES_BURMY_TRASH_CLOAK 1058
#define SPECIES_WORMADAM_SANDY_CLOAK 1059
#define SPECIES_WORMADAM_TRASH_CLOAK 1060
#define SPECIES_BURMY_SANDY 1057
#define SPECIES_BURMY_TRASH 1058
#define SPECIES_WORMADAM_SANDY 1059
#define SPECIES_WORMADAM_TRASH 1060
#define SPECIES_CHERRIM_SUNSHINE 1061
#define SPECIES_SHELLOS_EAST_SEA 1062
#define SPECIES_GASTRODON_EAST_SEA 1063
#define SPECIES_SHELLOS_EAST 1062
#define SPECIES_GASTRODON_EAST 1063
#define SPECIES_ROTOM_HEAT 1064
#define SPECIES_ROTOM_WASH 1065
#define SPECIES_ROTOM_FROST 1066
@ -1155,8 +1159,8 @@
#define SPECIES_ARCEUS_FAIRY 1089
#define SPECIES_BASCULIN_BLUE_STRIPED 1090
#define SPECIES_BASCULIN_WHITE_STRIPED 1091
#define SPECIES_DARMANITAN_ZEN_MODE 1092
#define SPECIES_DARMANITAN_GALARIAN_ZEN_MODE 1093
#define SPECIES_DARMANITAN_ZEN 1092
#define SPECIES_DARMANITAN_GALAR_ZEN 1093
#define SPECIES_DEERLING_SUMMER 1094
#define SPECIES_DEERLING_AUTUMN 1095
#define SPECIES_DEERLING_WINTER 1096
@ -1171,11 +1175,12 @@
#define SPECIES_KYUREM_BLACK 1105
#define SPECIES_KELDEO_RESOLUTE 1106
#define SPECIES_MELOETTA_PIROUETTE 1107
#define SPECIES_GENESECT_DOUSE_DRIVE 1108
#define SPECIES_GENESECT_SHOCK_DRIVE 1109
#define SPECIES_GENESECT_BURN_DRIVE 1110
#define SPECIES_GENESECT_CHILL_DRIVE 1111
#define SPECIES_GRENINJA_BATTLE_BOND 1112
#define SPECIES_GENESECT_DOUSE 1108
#define SPECIES_GENESECT_SHOCK 1109
#define SPECIES_GENESECT_BURN 1110
#define SPECIES_GENESECT_CHILL 1111
#define SPECIES_GRENINJA_BOND 1112
#define SPECIES_GRENINJA_BATTLE_BOND SPECIES_GRENINJA_BOND
#define SPECIES_GRENINJA_ASH 1113
#define SPECIES_VIVILLON_POLAR 1114
#define SPECIES_VIVILLON_TUNDRA 1115
@ -1195,20 +1200,20 @@
#define SPECIES_VIVILLON_OCEAN 1129
#define SPECIES_VIVILLON_JUNGLE 1130
#define SPECIES_VIVILLON_FANCY 1131
#define SPECIES_VIVILLON_POKE_BALL 1132
#define SPECIES_FLABEBE_YELLOW_FLOWER 1133
#define SPECIES_FLABEBE_ORANGE_FLOWER 1134
#define SPECIES_FLABEBE_BLUE_FLOWER 1135
#define SPECIES_FLABEBE_WHITE_FLOWER 1136
#define SPECIES_FLOETTE_YELLOW_FLOWER 1137
#define SPECIES_FLOETTE_ORANGE_FLOWER 1138
#define SPECIES_FLOETTE_BLUE_FLOWER 1139
#define SPECIES_FLOETTE_WHITE_FLOWER 1140
#define SPECIES_FLOETTE_ETERNAL_FLOWER 1141
#define SPECIES_FLORGES_YELLOW_FLOWER 1142
#define SPECIES_FLORGES_ORANGE_FLOWER 1143
#define SPECIES_FLORGES_BLUE_FLOWER 1144
#define SPECIES_FLORGES_WHITE_FLOWER 1145
#define SPECIES_VIVILLON_POKEBALL 1132
#define SPECIES_FLABEBE_YELLOW 1133
#define SPECIES_FLABEBE_ORANGE 1134
#define SPECIES_FLABEBE_BLUE 1135
#define SPECIES_FLABEBE_WHITE 1136
#define SPECIES_FLOETTE_YELLOW 1137
#define SPECIES_FLOETTE_ORANGE 1138
#define SPECIES_FLOETTE_BLUE 1139
#define SPECIES_FLOETTE_WHITE 1140
#define SPECIES_FLOETTE_ETERNAL 1141
#define SPECIES_FLORGES_YELLOW 1142
#define SPECIES_FLORGES_ORANGE 1143
#define SPECIES_FLORGES_BLUE 1144
#define SPECIES_FLORGES_WHITE 1145
#define SPECIES_FURFROU_HEART_TRIM 1146
#define SPECIES_FURFROU_STAR_TRIM 1147
#define SPECIES_FURFROU_DIAMOND_TRIM 1148
@ -1218,7 +1223,7 @@
#define SPECIES_FURFROU_LA_REINE_TRIM 1152
#define SPECIES_FURFROU_KABUKI_TRIM 1153
#define SPECIES_FURFROU_PHARAOH_TRIM 1154
#define SPECIES_MEOWSTIC_FEMALE 1155
#define SPECIES_MEOWSTIC_F 1155
#define SPECIES_AEGISLASH_BLADE 1156
#define SPECIES_PUMPKABOO_SMALL 1157
#define SPECIES_PUMPKABOO_LARGE 1158
@ -1281,7 +1286,7 @@
#define SPECIES_NECROZMA_DUSK_MANE 1207
#define SPECIES_NECROZMA_DAWN_WINGS 1208
#define SPECIES_NECROZMA_ULTRA 1209
#define SPECIES_MAGEARNA_ORIGINAL_COLOR 1210
#define SPECIES_MAGEARNA_ORIGINAL 1210
#define SPECIES_CRAMORANT_GULPING 1211
#define SPECIES_CRAMORANT_GORGING 1212
#define SPECIES_TOXTRICITY_LOW_KEY 1213
@ -1303,17 +1308,17 @@
#define SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL 1221
#define SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL 1222
#define SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL 1223
#define SPECIES_EISCUE_NOICE_FACE 1224
#define SPECIES_INDEEDEE_FEMALE 1225
#define SPECIES_EISCUE_NOICE 1224
#define SPECIES_INDEEDEE_F 1225
#define SPECIES_MORPEKO_HANGRY 1226
#define SPECIES_ZACIAN_CROWNED_SWORD 1227
#define SPECIES_ZAMAZENTA_CROWNED_SHIELD 1228
#define SPECIES_ZACIAN_CROWNED 1227
#define SPECIES_ZAMAZENTA_CROWNED 1228
#define SPECIES_ETERNATUS_ETERNAMAX 1229
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE 1230
#define SPECIES_URSHIFU_RAPID_STRIKE 1230
#define SPECIES_ZARUDE_DADA 1231
#define SPECIES_CALYREX_ICE_RIDER 1232
#define SPECIES_CALYREX_SHADOW_RIDER 1233
#define SPECIES_BASCULEGION_FEMALE 1234
#define SPECIES_CALYREX_ICE 1232
#define SPECIES_CALYREX_SHADOW 1233
#define SPECIES_BASCULEGION_F 1234
#define SPECIES_ALCREMIE_BERRY SPECIES_ALCREMIE_BERRY_VANILLA_CREAM
#define SPECIES_ALCREMIE_BERRY_VANILLA_CREAM 1235
#define SPECIES_ALCREMIE_BERRY_RUBY_CREAM 1236
@ -1387,9 +1392,9 @@
#define SPECIES_QUAXWELL 1296
#define SPECIES_QUAQUAVAL 1297
#define SPECIES_LECHONK 1298
#define SPECIES_OINKOLOGNE SPECIES_OINKOLOGNE_MALE
#define SPECIES_OINKOLOGNE_MALE 1299
#define SPECIES_OINKOLOGNE_FEMALE 1300
#define SPECIES_OINKOLOGNE SPECIES_OINKOLOGNE_M
#define SPECIES_OINKOLOGNE_M 1299
#define SPECIES_OINKOLOGNE_F 1300
#define SPECIES_TAROUNTULA 1301
#define SPECIES_SPIDOPS 1302
#define SPECIES_NYMBLE 1303
@ -1398,19 +1403,19 @@
#define SPECIES_PAWMO 1306
#define SPECIES_PAWMOT 1307
#define SPECIES_TANDEMAUS 1308
#define SPECIES_MAUSHOLD SPECIES_MAUSHOLD_FAMILY_OF_THREE
#define SPECIES_MAUSHOLD_FAMILY_OF_THREE 1309
#define SPECIES_MAUSHOLD_FAMILY_OF_FOUR 1310
#define SPECIES_MAUSHOLD SPECIES_MAUSHOLD_THREE
#define SPECIES_MAUSHOLD_THREE 1309
#define SPECIES_MAUSHOLD_FOUR 1310
#define SPECIES_FIDOUGH 1311
#define SPECIES_DACHSBUN 1312
#define SPECIES_SMOLIV 1313
#define SPECIES_DOLLIV 1314
#define SPECIES_ARBOLIVA 1315
#define SPECIES_SQUAWKABILLY SPECIES_SQUAWKABILLY_GREEN_PLUMAGE
#define SPECIES_SQUAWKABILLY_GREEN_PLUMAGE 1316
#define SPECIES_SQUAWKABILLY_BLUE_PLUMAGE 1317
#define SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE 1318
#define SPECIES_SQUAWKABILLY_WHITE_PLUMAGE 1319
#define SPECIES_SQUAWKABILLY SPECIES_SQUAWKABILLY_GREEN
#define SPECIES_SQUAWKABILLY_GREEN 1316
#define SPECIES_SQUAWKABILLY_BLUE 1317
#define SPECIES_SQUAWKABILLY_YELLOW 1318
#define SPECIES_SQUAWKABILLY_WHITE 1319
#define SPECIES_NACLI 1320
#define SPECIES_NACLSTACK 1321
#define SPECIES_GARGANACL 1322
@ -1498,10 +1503,10 @@
#define SPECIES_KORAIDON 1400
#define SPECIES_MIRAIDON 1401
// Paldean Forms
#define SPECIES_TAUROS_PALDEAN_COMBAT_BREED 1402
#define SPECIES_TAUROS_PALDEAN_BLAZE_BREED 1403
#define SPECIES_TAUROS_PALDEAN_AQUA_BREED 1404
#define SPECIES_WOOPER_PALDEAN 1405
#define SPECIES_TAUROS_PALDEA_COMBAT 1402
#define SPECIES_TAUROS_PALDEA_BLAZE 1403
#define SPECIES_TAUROS_PALDEA_AQUA 1404
#define SPECIES_WOOPER_PALDEA 1405
// Scarlet and Violet 1.2.0
#define SPECIES_WALKING_WAKE 1406
#define SPECIES_IRON_LEAVES 1407
@ -1516,15 +1521,15 @@
#define SPECIES_OKIDOGI 1413
#define SPECIES_MUNKIDORI 1414
#define SPECIES_FEZANDIPITI 1415
#define SPECIES_OGERPON SPECIES_OGERPON_TEAL_MASK
#define SPECIES_OGERPON_TEAL_MASK 1416
#define SPECIES_OGERPON_WELLSPRING_MASK 1417
#define SPECIES_OGERPON_HEARTHFLAME_MASK 1418
#define SPECIES_OGERPON_CORNERSTONE_MASK 1419
#define SPECIES_OGERPON_TEAL_MASK_TERA 1420
#define SPECIES_OGERPON_WELLSPRING_MASK_TERA 1421
#define SPECIES_OGERPON_HEARTHFLAME_MASK_TERA 1422
#define SPECIES_OGERPON_CORNERSTONE_MASK_TERA 1423
#define SPECIES_OGERPON SPECIES_OGERPON_TEAL
#define SPECIES_OGERPON_TEAL 1416
#define SPECIES_OGERPON_WELLSPRING 1417
#define SPECIES_OGERPON_HEARTHFLAME 1418
#define SPECIES_OGERPON_CORNERSTONE 1419
#define SPECIES_OGERPON_TEAL_TERA 1420
#define SPECIES_OGERPON_WELLSPRING_TERA 1421
#define SPECIES_OGERPON_HEARTHFLAME_TERA 1422
#define SPECIES_OGERPON_CORNERSTONE_TERA 1423
#define SPECIES_URSALUNA_BLOODMOON 1424
// Indigo Disk
#define SPECIES_ARCHALUDON 1425
@ -1539,8 +1544,8 @@
#define SPECIES_TERAPAGOS_STELLAR 1433
#define SPECIES_PECHARUNT 1434
#define SPECIES_LUGIA_SHADOW 1435
#define SPECIES_MOTHIM_SANDY_CLOAK 1436
#define SPECIES_MOTHIM_TRASH_CLOAK 1437
#define SPECIES_MOTHIM_SANDY 1436
#define SPECIES_MOTHIM_TRASH 1437
#define SPECIES_SCATTERBUG_POLAR 1438
#define SPECIES_SCATTERBUG_TUNDRA 1439
#define SPECIES_SCATTERBUG_CONTINENTAL 1440
@ -1559,7 +1564,7 @@
#define SPECIES_SCATTERBUG_OCEAN 1453
#define SPECIES_SCATTERBUG_JUNGLE 1454
#define SPECIES_SCATTERBUG_FANCY 1455
#define SPECIES_SCATTERBUG_POKE_BALL 1456
#define SPECIES_SCATTERBUG_POKEBALL 1456
#define SPECIES_SPEWPA_POLAR 1457
#define SPECIES_SPEWPA_TUNDRA 1458
#define SPECIES_SPEWPA_CONTINENTAL 1459
@ -1578,8 +1583,8 @@
#define SPECIES_SPEWPA_OCEAN 1472
#define SPECIES_SPEWPA_JUNGLE 1473
#define SPECIES_SPEWPA_FANCY 1474
#define SPECIES_SPEWPA_POKE_BALL 1475
#define SPECIES_RATICATE_ALOLAN_TOTEM 1476
#define SPECIES_SPEWPA_POKEBALL 1475
#define SPECIES_RATICATE_ALOLA_TOTEM 1476
#define SPECIES_GUMSHOOS_TOTEM 1477
#define SPECIES_VIKAVOLT_TOTEM 1478
#define SPECIES_LURANTIS_TOTEM 1479
@ -1587,191 +1592,56 @@
#define SPECIES_MIMIKYU_TOTEM SPECIES_MIMIKYU_TOTEM_DISGUISED
#define SPECIES_MIMIKYU_TOTEM_DISGUISED 1481
#define SPECIES_KOMMO_O_TOTEM 1482
#define SPECIES_MAROWAK_ALOLAN_TOTEM 1483
#define SPECIES_MAROWAK_ALOLA_TOTEM 1483
#define SPECIES_RIBOMBEE_TOTEM 1484
#define SPECIES_ARAQUANID_TOTEM 1485
#define SPECIES_TOGEDEMARU_TOTEM 1486
#define SPECIES_PIKACHU_PARTNER 1487
#define SPECIES_EEVEE_PARTNER 1488
#define SPECIES_VENUSAUR_GIGANTAMAX 1489
#define SPECIES_BLASTOISE_GIGANTAMAX 1490
#define SPECIES_CHARIZARD_GIGANTAMAX 1491
#define SPECIES_BUTTERFREE_GIGANTAMAX 1492
#define SPECIES_PIKACHU_GIGANTAMAX 1493
#define SPECIES_MEOWTH_GIGANTAMAX 1494
#define SPECIES_MACHAMP_GIGANTAMAX 1495
#define SPECIES_GENGAR_GIGANTAMAX 1496
#define SPECIES_KINGLER_GIGANTAMAX 1497
#define SPECIES_LAPRAS_GIGANTAMAX 1498
#define SPECIES_EEVEE_GIGANTAMAX 1499
#define SPECIES_SNORLAX_GIGANTAMAX 1500
#define SPECIES_GARBODOR_GIGANTAMAX 1501
#define SPECIES_MELMETAL_GIGANTAMAX 1502
#define SPECIES_RILLABOOM_GIGANTAMAX 1503
#define SPECIES_CINDERACE_GIGANTAMAX 1504
#define SPECIES_INTELEON_GIGANTAMAX 1505
#define SPECIES_CORVIKNIGHT_GIGANTAMAX 1506
#define SPECIES_ORBEETLE_GIGANTAMAX 1507
#define SPECIES_DREDNAW_GIGANTAMAX 1508
#define SPECIES_COALOSSAL_GIGANTAMAX 1509
#define SPECIES_FLAPPLE_GIGANTAMAX 1510
#define SPECIES_APPLETUN_GIGANTAMAX 1511
#define SPECIES_SANDACONDA_GIGANTAMAX 1512
#define SPECIES_TOXTRICITY_AMPED_GIGANTAMAX 1513
#define SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX 1514
#define SPECIES_CENTISKORCH_GIGANTAMAX 1515
#define SPECIES_HATTERENE_GIGANTAMAX 1516
#define SPECIES_GRIMMSNARL_GIGANTAMAX 1517
#define SPECIES_ALCREMIE_GIGANTAMAX 1518
#define SPECIES_COPPERAJAH_GIGANTAMAX 1519
#define SPECIES_DURALUDON_GIGANTAMAX 1520
#define SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX 1521
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX 1522
#define SPECIES_MIMIKYU_TOTEM_BUSTED 1523
#define SPECIES_PIKACHU_STARTER 1487
#define SPECIES_EEVEE_STARTER 1488
#define SPECIES_VENUSAUR_GMAX 1489
#define SPECIES_BLASTOISE_GMAX 1490
#define SPECIES_CHARIZARD_GMAX 1491
#define SPECIES_BUTTERFREE_GMAX 1492
#define SPECIES_PIKACHU_GMAX 1493
#define SPECIES_MEOWTH_GMAX 1494
#define SPECIES_MACHAMP_GMAX 1495
#define SPECIES_GENGAR_GMAX 1496
#define SPECIES_KINGLER_GMAX 1497
#define SPECIES_LAPRAS_GMAX 1498
#define SPECIES_EEVEE_GMAX 1499
#define SPECIES_SNORLAX_GMAX 1500
#define SPECIES_GARBODOR_GMAX 1501
#define SPECIES_MELMETAL_GMAX 1502
#define SPECIES_RILLABOOM_GMAX 1503
#define SPECIES_CINDERACE_GMAX 1504
#define SPECIES_INTELEON_GMAX 1505
#define SPECIES_CORVIKNIGHT_GMAX 1506
#define SPECIES_ORBEETLE_GMAX 1507
#define SPECIES_DREDNAW_GMAX 1508
#define SPECIES_COALOSSAL_GMAX 1509
#define SPECIES_FLAPPLE_GMAX 1510
#define SPECIES_APPLETUN_GMAX 1511
#define SPECIES_SANDACONDA_GMAX 1512
#define SPECIES_TOXTRICITY_AMPED_GMAX 1513
#define SPECIES_TOXTRICITY_LOW_KEY_GMAX 1514
#define SPECIES_CENTISKORCH_GMAX 1515
#define SPECIES_HATTERENE_GMAX 1516
#define SPECIES_GRIMMSNARL_GMAX 1517
#define SPECIES_ALCREMIE_GMAX 1518
#define SPECIES_COPPERAJAH_GMAX 1519
#define SPECIES_DURALUDON_GMAX 1520
#define SPECIES_URSHIFU_SINGLE_STRIKE_GMAX 1521
#define SPECIES_URSHIFU_GMAX SPECIES_URSHIFU_SINGLE_STRIKE_GMAX
#define SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GMAX SPECIES_URSHIFU_SINGLE_STRIKE_GMAX
#define SPECIES_URSHIFU_RAPID_STRIKE_GMAX 1522
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX SPECIES_URSHIFU_RAPID_STRIKE_GMAX
#define SPECIES_MIMIKYU_BUSTED_TOTEM 1523
#define SPECIES_MIMIKYU_TOTEM_BUSTED SPECIES_MIMIKYU_BUSTED_TOTEM
#define SPECIES_EGG (SPECIES_MIMIKYU_TOTEM_BUSTED + 1)
#define SPECIES_EGG (SPECIES_MIMIKYU_BUSTED_TOTEM + 1)
#define NUM_SPECIES SPECIES_EGG
#define SPECIES_SHINY_TAG 5000
// Competitive format aliases
#define SPECIES_ALCREMIE_GMAX SPECIES_ALCREMIE_GIGANTAMAX
#define SPECIES_APPLETUN_GMAX SPECIES_APPLETUN_GIGANTAMAX
#define SPECIES_ARCANINE_HISUI SPECIES_ARCANINE_HISUIAN
#define SPECIES_ARTICUNO_GALAR SPECIES_ARTICUNO_GALARIAN
#define SPECIES_AVALUGG_HISUI SPECIES_AVALUGG_HISUIAN
#define SPECIES_BLASTOISE_GMAX SPECIES_BLASTOISE_GIGANTAMAX
#define SPECIES_BRAVIARY_HISUI SPECIES_BRAVIARY_HISUIAN
#define SPECIES_BURMY_SANDY SPECIES_BURMY_SANDY_CLOAK
#define SPECIES_BURMY_TRASH SPECIES_BURMY_TRASH_CLOAK
#define SPECIES_BUTTERFREE_GMAX SPECIES_BUTTERFREE_GIGANTAMAX
#define SPECIES_CALYREX_ICE SPECIES_CALYREX_ICE_RIDER
#define SPECIES_CALYREX_SHADOW SPECIES_CALYREX_SHADOW_RIDER
#define SPECIES_CENTISKORCH_GMAX SPECIES_CENTISKORCH_GIGANTAMAX
#define SPECIES_CHARIZARD_GMAX SPECIES_CHARIZARD_GIGANTAMAX
#define SPECIES_CINDERACE_GMAX SPECIES_CINDERACE_GIGANTAMAX
#define SPECIES_COALOSSAL_GMAX SPECIES_COALOSSAL_GIGANTAMAX
#define SPECIES_COPPERAJAH_GMAX SPECIES_COPPERAJAH_GIGANTAMAX
#define SPECIES_CORSOLA_GALAR SPECIES_CORSOLA_GALARIAN
#define SPECIES_CORVIKNIGHT_GMAX SPECIES_CORVIKNIGHT_GIGANTAMAX
#define SPECIES_DARMANITAN_GALAR SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE
#define SPECIES_DARMANITAN_GALAR_ZEN SPECIES_DARMANITAN_GALARIAN_ZEN_MODE
#define SPECIES_DARMANITAN_ZEN SPECIES_DARMANITAN_ZEN_MODE
#define SPECIES_DARUMAKA_GALAR SPECIES_DARUMAKA_GALARIAN
#define SPECIES_DECIDUEYE_HISUI SPECIES_DECIDUEYE_HISUIAN
#define SPECIES_DIGLETT_ALOLA SPECIES_DIGLETT_ALOLAN
#define SPECIES_DREDNAW_GMAX SPECIES_DREDNAW_GIGANTAMAX
#define SPECIES_DUGTRIO_ALOLA SPECIES_DUGTRIO_ALOLAN
#define SPECIES_DURALUDON_GMAX SPECIES_DURALUDON_GIGANTAMAX
#define SPECIES_EEVEE_GMAX SPECIES_EEVEE_GIGANTAMAX
#define SPECIES_EEVEE_STARTER SPECIES_EEVEE_PARTNER
#define SPECIES_EISCUE_NOICE SPECIES_EISCUE_NOICE_FACE
#define SPECIES_ELECTRODE_HISUI SPECIES_ELECTRODE_HISUIAN
#define SPECIES_EXEGGUTOR_ALOLA SPECIES_EXEGGUTOR_ALOLAN
#define SPECIES_FARFETCHD_GALAR SPECIES_FARFETCHD_GALARIAN
#define SPECIES_FLAPPLE_GMAX SPECIES_FLAPPLE_GIGANTAMAX
#define SPECIES_FLOETTE_ETERNAL SPECIES_FLOETTE_ETERNAL_FLOWER
#define SPECIES_GARBODOR_GMAX SPECIES_GARBODOR_GIGANTAMAX
#define SPECIES_GASTRODON_EAST SPECIES_GASTRODON_EAST_SEA
#define SPECIES_GENESECT_BURN SPECIES_GENESECT_BURN_DRIVE
#define SPECIES_GENESECT_CHILL SPECIES_GENESECT_CHILL_DRIVE
#define SPECIES_GENESECT_DOUSE SPECIES_GENESECT_DOUSE_DRIVE
#define SPECIES_GENESECT_SHOCK SPECIES_GENESECT_SHOCK_DRIVE
#define SPECIES_GENGAR_GMAX SPECIES_GENGAR_GIGANTAMAX
#define SPECIES_GEODUDE_ALOLA SPECIES_GEODUDE_ALOLAN
#define SPECIES_GOLEM_ALOLA SPECIES_GOLEM_ALOLAN
#define SPECIES_GOODRA_HISUI SPECIES_GOODRA_HISUIAN
#define SPECIES_GRAVELER_ALOLA SPECIES_GRAVELER_ALOLAN
#define SPECIES_GRENINJA_BOND SPECIES_GRENINJA_BATTLE_BOND
#define SPECIES_GRIMER_ALOLA SPECIES_GRIMER_ALOLAN
#define SPECIES_GRIMMSNARL_GMAX SPECIES_GRIMMSNARL_GIGANTAMAX
#define SPECIES_GROWLITHE_HISUI SPECIES_GROWLITHE_HISUIAN
#define SPECIES_HATTERENE_GMAX SPECIES_HATTERENE_GIGANTAMAX
#define SPECIES_INTELEON_GMAX SPECIES_INTELEON_GIGANTAMAX
#define SPECIES_KINGLER_GMAX SPECIES_KINGLER_GIGANTAMAX
#define SPECIES_LAPRAS_GMAX SPECIES_LAPRAS_GIGANTAMAX
#define SPECIES_LILLIGANT_HISUI SPECIES_LILLIGANT_HISUIAN
#define SPECIES_LINOONE_GALAR SPECIES_LINOONE_GALARIAN
#define SPECIES_MACHAMP_GMAX SPECIES_MACHAMP_GIGANTAMAX
#define SPECIES_MAGEARNA_ORIGINAL SPECIES_MAGEARNA_ORIGINAL_COLOR
#define SPECIES_MAROWAK_ALOLA SPECIES_MAROWAK_ALOLAN
#define SPECIES_MAROWAK_ALOLA_TOTEM SPECIES_MAROWAK_ALOLAN_TOTEM
#define SPECIES_MAUSHOLD_FOUR SPECIES_MAUSHOLD_FAMILY_OF_FOUR
#define SPECIES_MELMETAL_GMAX SPECIES_MELMETAL_GIGANTAMAX
#define SPECIES_MEOWTH_ALOLA SPECIES_MEOWTH_ALOLAN
#define SPECIES_MEOWTH_GALAR SPECIES_MEOWTH_GALARIAN
#define SPECIES_MEOWTH_GMAX SPECIES_MEOWTH_GIGANTAMAX
#define SPECIES_MOLTRES_GALAR SPECIES_MOLTRES_GALARIAN
#define SPECIES_MR_MIME_GALAR SPECIES_MR_MIME_GALARIAN
#define SPECIES_MUK_ALOLA SPECIES_MUK_ALOLAN
#define SPECIES_NINETALES_ALOLA SPECIES_NINETALES_ALOLAN
#define SPECIES_OGERPON_TEAL SPECIES_OGERPON_TEAL_MASK
#define SPECIES_OGERPON_WELLSPRING SPECIES_OGERPON_WELLSPRING_MASK
#define SPECIES_OGERPON_HEARTHFLAME SPECIES_OGERPON_HEARTHFLAME_MASK
#define SPECIES_OGERPON_CORNERSTONE SPECIES_OGERPON_CORNERSTONE_MASK
#define SPECIES_ORBEETLE_GMAX SPECIES_ORBEETLE_GIGANTAMAX
#define SPECIES_PERSIAN_ALOLA SPECIES_PERSIAN_ALOLAN
#define SPECIES_PIKACHU_ALOLA SPECIES_PIKACHU_ALOLA_CAP
#define SPECIES_PIKACHU_GMAX SPECIES_PIKACHU_GIGANTAMAX
#define SPECIES_PIKACHU_HOENN SPECIES_PIKACHU_HOENN_CAP
#define SPECIES_PIKACHU_KALOS SPECIES_PIKACHU_KALOS_CAP
#define SPECIES_PIKACHU_ORIGINAL SPECIES_PIKACHU_ORIGINAL_CAP
//#define SPECIES_PIKACHU_PARTNER SPECIES_PIKACHU_PARTNER_CAP
#define SPECIES_PIKACHU_PHD SPECIES_PIKACHU_PH_D
#define SPECIES_PIKACHU_SINNOH SPECIES_PIKACHU_SINNOH_CAP
#define SPECIES_PIKACHU_STARTER SPECIES_PIKACHU_PARTNER
#define SPECIES_PIKACHU_UNOVA SPECIES_PIKACHU_UNOVA_CAP
#define SPECIES_PIKACHU_WORLD SPECIES_PIKACHU_WORLD_CAP
#define SPECIES_PONYTA_GALAR SPECIES_PONYTA_GALARIAN
#define SPECIES_QWILFISH_HISUI SPECIES_QWILFISH_HISUIAN
#define SPECIES_RAICHU_ALOLA SPECIES_RAICHU_ALOLAN
#define SPECIES_RAPIDASH_GALAR SPECIES_RAPIDASH_GALARIAN
#define SPECIES_RATICATE_ALOLA SPECIES_RATICATE_ALOLAN
#define SPECIES_RATICATE_ALOLA_TOTEM SPECIES_RATICATE_ALOLAN_TOTEM
#define SPECIES_RATTATA_ALOLA SPECIES_RATTATA_ALOLAN
#define SPECIES_RILLABOOM_GMAX SPECIES_RILLABOOM_GIGANTAMAX
#define SPECIES_SAMUROTT_HISUI SPECIES_SAMUROTT_HISUIAN
#define SPECIES_SANDACONDA_GMAX SPECIES_SANDACONDA_GIGANTAMAX
#define SPECIES_SANDSHREW_ALOLA SPECIES_SANDSHREW_ALOLAN
#define SPECIES_SANDSLASH_ALOLA SPECIES_SANDSLASH_ALOLAN
#define SPECIES_SHELLOS_EAST SPECIES_SHELLOS_EAST_SEA
#define SPECIES_SIRFETCH_D SPECIES_SIRFETCHD
#define SPECIES_SLIGGOO_HISUI SPECIES_SLIGGOO_HISUIAN
#define SPECIES_SLOWBRO_GALAR SPECIES_SLOWBRO_GALARIAN
#define SPECIES_SLOWKING_GALAR SPECIES_SLOWKING_GALARIAN
#define SPECIES_SLOWPOKE_GALAR SPECIES_SLOWPOKE_GALARIAN
#define SPECIES_SNEASEL_HISUI SPECIES_SNEASEL_HISUIAN
#define SPECIES_SNORLAX_GMAX SPECIES_SNORLAX_GIGANTAMAX
#define SPECIES_SQUAWKABILLY_BLUE SPECIES_SQUAWKABILLY_BLUE_PLUMAGE
#define SPECIES_SQUAWKABILLY_WHITE SPECIES_SQUAWKABILLY_WHITE_PLUMAGE
#define SPECIES_SQUAWKABILLY_YELLOW SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE
#define SPECIES_STUNFISK_GALAR SPECIES_STUNFISK_GALARIAN
#define SPECIES_TAUROS_PALDEA_AQUA SPECIES_TAUROS_PALDEAN_AQUA_BREED
#define SPECIES_TAUROS_PALDEA_BLAZE SPECIES_TAUROS_PALDEAN_BLAZE_BREED
#define SPECIES_TAUROS_PALDEA_COMBAT SPECIES_TAUROS_PALDEAN_COMBAT_BREED
#define SPECIES_TOXTRICITY_AMPED_GMAX SPECIES_TOXTRICITY_AMPED_GIGANTAMAX
#define SPECIES_TOXTRICITY_LOW_KEY_GMAX SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX
#define SPECIES_TYPHLOSION_HISUI SPECIES_TYPHLOSION_HISUIAN
#define SPECIES_UNOWN_EXCLAMATION SPECIES_UNOWN_EMARK
#define SPECIES_UNOWN_QUESTION SPECIES_UNOWN_QMARK
#define SPECIES_URSHIFU_GMAX SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX
#define SPECIES_URSHIFU_RAPID_STRIKE SPECIES_URSHIFU_RAPID_STRIKE_STYLE
#define SPECIES_URSHIFU_RAPID_STRIKE_GMAX SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX
#define SPECIES_VENUSAUR_GMAX SPECIES_VENUSAUR_GIGANTAMAX
#define SPECIES_VIVILLON_POKEBALL SPECIES_VIVILLON_POKE_BALL
#define SPECIES_VOLTORB_HISUI SPECIES_VOLTORB_HISUIAN
#define SPECIES_VULPIX_ALOLA SPECIES_VULPIX_ALOLAN
#define SPECIES_WEEZING_GALAR SPECIES_WEEZING_GALARIAN
#define SPECIES_WOOPER_PALDEA SPECIES_WOOPER_PALDEAN
#define SPECIES_WORMADAM_SANDY SPECIES_WORMADAM_SANDY_CLOAK
#define SPECIES_WORMADAM_TRASH SPECIES_WORMADAM_TRASH_CLOAK
#define SPECIES_YAMASK_GALAR SPECIES_YAMASK_GALARIAN
#define SPECIES_ZACIAN_CROWNED SPECIES_ZACIAN_CROWNED_SWORD
#define SPECIES_ZAMAZENTA_CROWNED SPECIES_ZAMAZENTA_CROWNED_SHIELD
#define SPECIES_ZAPDOS_GALAR SPECIES_ZAPDOS_GALARIAN
#define SPECIES_ZIGZAGOON_GALAR SPECIES_ZIGZAGOON_GALARIAN
#define SPECIES_ZOROARK_HISUI SPECIES_ZOROARK_HISUIAN
#define SPECIES_ZORUA_HISUI SPECIES_ZORUA_HISUIAN
#endif // GUARD_CONSTANTS_SPECIES_H

2
src/battle_ai_util.c
View File

@ -3981,7 +3981,7 @@ bool32 ShouldUseZMove(u32 battlerAtk, u32 battlerDef, u32 chosenMove)
return FALSE; // Don't waste a Z-Move busting disguise
if (gBattleMons[battlerDef].ability == ABILITY_ICE_FACE
&& !gMovesInfo[zMove].ignoresTargetAbility
&& gBattleMons[battlerDef].species == SPECIES_EISCUE_ICE_FACE && IS_MOVE_PHYSICAL(chosenMove))
&& gBattleMons[battlerDef].species == SPECIES_EISCUE_ICE && IS_MOVE_PHYSICAL(chosenMove))
return FALSE; // Don't waste a Z-Move busting Ice Face
if (IS_MOVE_STATUS(chosenMove) && !IS_MOVE_STATUS(zMove))

6
src/battle_controller_player.c
View File

@ -1725,9 +1725,9 @@ static void MoveSelectionDisplayMoveType(u32 battler)
{
speciesId = gBattleMons[battler].species;
if (speciesId == SPECIES_OGERPON_WELLSPRING_MASK || speciesId == SPECIES_OGERPON_WELLSPRING_MASK_TERA
|| speciesId == SPECIES_OGERPON_HEARTHFLAME_MASK || speciesId == SPECIES_OGERPON_HEARTHFLAME_MASK_TERA
|| speciesId == SPECIES_OGERPON_CORNERSTONE_MASK || speciesId == SPECIES_OGERPON_CORNERSTONE_MASK_TERA)
if (speciesId == SPECIES_OGERPON_WELLSPRING || speciesId == SPECIES_OGERPON_WELLSPRING_TERA
|| speciesId == SPECIES_OGERPON_HEARTHFLAME || speciesId == SPECIES_OGERPON_HEARTHFLAME_TERA
|| speciesId == SPECIES_OGERPON_CORNERSTONE || speciesId == SPECIES_OGERPON_CORNERSTONE_TERA)
type = gBattleMons[battler].types[1];
}
else if (gMovesInfo[moveInfo->moves[gMoveSelectionCursor[battler]]].category == DAMAGE_CATEGORY_STATUS

68
src/battle_dynamax.c
View File

@ -34,40 +34,40 @@ struct GMaxMove
static const struct GMaxMove sGMaxMoveTable[] =
{
{SPECIES_VENUSAUR_GIGANTAMAX, TYPE_GRASS, MOVE_G_MAX_VINE_LASH},
{SPECIES_BLASTOISE_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_CANNONADE},
{SPECIES_CHARIZARD_GIGANTAMAX, TYPE_FIRE, MOVE_G_MAX_WILDFIRE},
{SPECIES_BUTTERFREE_GIGANTAMAX, TYPE_BUG, MOVE_G_MAX_BEFUDDLE},
{SPECIES_PIKACHU_GIGANTAMAX, TYPE_ELECTRIC, MOVE_G_MAX_VOLT_CRASH},
{SPECIES_MEOWTH_GIGANTAMAX, TYPE_NORMAL, MOVE_G_MAX_GOLD_RUSH},
{SPECIES_MACHAMP_GIGANTAMAX, TYPE_FIGHTING, MOVE_G_MAX_CHI_STRIKE},
{SPECIES_GENGAR_GIGANTAMAX, TYPE_GHOST, MOVE_G_MAX_TERROR},
{SPECIES_KINGLER_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_FOAM_BURST},
{SPECIES_LAPRAS_GIGANTAMAX, TYPE_ICE, MOVE_G_MAX_RESONANCE},
{SPECIES_EEVEE_GIGANTAMAX, TYPE_NORMAL, MOVE_G_MAX_CUDDLE},
{SPECIES_SNORLAX_GIGANTAMAX, TYPE_NORMAL, MOVE_G_MAX_REPLENISH},
{SPECIES_GARBODOR_GIGANTAMAX, TYPE_POISON, MOVE_G_MAX_MALODOR},
{SPECIES_MELMETAL_GIGANTAMAX, TYPE_STEEL, MOVE_G_MAX_MELTDOWN},
{SPECIES_RILLABOOM_GIGANTAMAX, TYPE_GRASS, MOVE_G_MAX_DRUM_SOLO},
{SPECIES_CINDERACE_GIGANTAMAX, TYPE_FIRE, MOVE_G_MAX_FIREBALL},
{SPECIES_INTELEON_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_HYDROSNIPE},
{SPECIES_CORVIKNIGHT_GIGANTAMAX, TYPE_FLYING, MOVE_G_MAX_WIND_RAGE},
{SPECIES_ORBEETLE_GIGANTAMAX, TYPE_PSYCHIC, MOVE_G_MAX_GRAVITAS},
{SPECIES_DREDNAW_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_STONESURGE},
{SPECIES_COALOSSAL_GIGANTAMAX, TYPE_ROCK, MOVE_G_MAX_VOLCALITH},
{SPECIES_FLAPPLE_GIGANTAMAX, TYPE_GRASS, MOVE_G_MAX_TARTNESS},
{SPECIES_APPLETUN_GIGANTAMAX, TYPE_GRASS, MOVE_G_MAX_SWEETNESS},
{SPECIES_SANDACONDA_GIGANTAMAX, TYPE_GROUND, MOVE_G_MAX_SANDBLAST},
{SPECIES_TOXTRICITY_AMPED_GIGANTAMAX, TYPE_ELECTRIC, MOVE_G_MAX_STUN_SHOCK},
{SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX, TYPE_ELECTRIC, MOVE_G_MAX_STUN_SHOCK},
{SPECIES_CENTISKORCH_GIGANTAMAX, TYPE_FIRE, MOVE_G_MAX_CENTIFERNO},
{SPECIES_HATTERENE_GIGANTAMAX, TYPE_FAIRY, MOVE_G_MAX_SMITE},
{SPECIES_GRIMMSNARL_GIGANTAMAX, TYPE_DARK, MOVE_G_MAX_SNOOZE},
{SPECIES_ALCREMIE_GIGANTAMAX, TYPE_FAIRY, MOVE_G_MAX_FINALE},
{SPECIES_COPPERAJAH_GIGANTAMAX, TYPE_STEEL, MOVE_G_MAX_STEELSURGE},
{SPECIES_DURALUDON_GIGANTAMAX, TYPE_DRAGON, MOVE_G_MAX_DEPLETION},
{SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX,TYPE_DARK, MOVE_G_MAX_ONE_BLOW},
{SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_RAPID_FLOW},
{SPECIES_VENUSAUR_GMAX, TYPE_GRASS, MOVE_G_MAX_VINE_LASH},
{SPECIES_BLASTOISE_GMAX, TYPE_WATER, MOVE_G_MAX_CANNONADE},
{SPECIES_CHARIZARD_GMAX, TYPE_FIRE, MOVE_G_MAX_WILDFIRE},
{SPECIES_BUTTERFREE_GMAX, TYPE_BUG, MOVE_G_MAX_BEFUDDLE},
{SPECIES_PIKACHU_GMAX, TYPE_ELECTRIC, MOVE_G_MAX_VOLT_CRASH},
{SPECIES_MEOWTH_GMAX, TYPE_NORMAL, MOVE_G_MAX_GOLD_RUSH},
{SPECIES_MACHAMP_GMAX, TYPE_FIGHTING, MOVE_G_MAX_CHI_STRIKE},
{SPECIES_GENGAR_GMAX, TYPE_GHOST, MOVE_G_MAX_TERROR},
{SPECIES_KINGLER_GMAX, TYPE_WATER, MOVE_G_MAX_FOAM_BURST},
{SPECIES_LAPRAS_GMAX, TYPE_ICE, MOVE_G_MAX_RESONANCE},
{SPECIES_EEVEE_GMAX, TYPE_NORMAL, MOVE_G_MAX_CUDDLE},
{SPECIES_SNORLAX_GMAX, TYPE_NORMAL, MOVE_G_MAX_REPLENISH},
{SPECIES_GARBODOR_GMAX, TYPE_POISON, MOVE_G_MAX_MALODOR},
{SPECIES_MELMETAL_GMAX, TYPE_STEEL, MOVE_G_MAX_MELTDOWN},
{SPECIES_RILLABOOM_GMAX, TYPE_GRASS, MOVE_G_MAX_DRUM_SOLO},
{SPECIES_CINDERACE_GMAX, TYPE_FIRE, MOVE_G_MAX_FIREBALL},
{SPECIES_INTELEON_GMAX, TYPE_WATER, MOVE_G_MAX_HYDROSNIPE},
{SPECIES_CORVIKNIGHT_GMAX, TYPE_FLYING, MOVE_G_MAX_WIND_RAGE},
{SPECIES_ORBEETLE_GMAX, TYPE_PSYCHIC, MOVE_G_MAX_GRAVITAS},
{SPECIES_DREDNAW_GMAX, TYPE_WATER, MOVE_G_MAX_STONESURGE},
{SPECIES_COALOSSAL_GMAX, TYPE_ROCK, MOVE_G_MAX_VOLCALITH},
{SPECIES_FLAPPLE_GMAX, TYPE_GRASS, MOVE_G_MAX_TARTNESS},
{SPECIES_APPLETUN_GMAX, TYPE_GRASS, MOVE_G_MAX_SWEETNESS},
{SPECIES_SANDACONDA_GMAX, TYPE_GROUND, MOVE_G_MAX_SANDBLAST},
{SPECIES_TOXTRICITY_AMPED_GMAX, TYPE_ELECTRIC, MOVE_G_MAX_STUN_SHOCK},
{SPECIES_TOXTRICITY_LOW_KEY_GMAX, TYPE_ELECTRIC, MOVE_G_MAX_STUN_SHOCK},
{SPECIES_CENTISKORCH_GMAX, TYPE_FIRE, MOVE_G_MAX_CENTIFERNO},
{SPECIES_HATTERENE_GMAX, TYPE_FAIRY, MOVE_G_MAX_SMITE},
{SPECIES_GRIMMSNARL_GMAX, TYPE_DARK, MOVE_G_MAX_SNOOZE},
{SPECIES_ALCREMIE_GMAX, TYPE_FAIRY, MOVE_G_MAX_FINALE},
{SPECIES_COPPERAJAH_GMAX, TYPE_STEEL, MOVE_G_MAX_STEELSURGE},
{SPECIES_DURALUDON_GMAX, TYPE_DRAGON, MOVE_G_MAX_DEPLETION},
{SPECIES_URSHIFU_SINGLE_STRIKE_GMAX,TYPE_DARK, MOVE_G_MAX_ONE_BLOW},
{SPECIES_URSHIFU_RAPID_STRIKE_GMAX, TYPE_WATER, MOVE_G_MAX_RAPID_FLOW},
};
// Returns whether a battler can Dynamax.

12
src/battle_main.c
View File

@ -5915,16 +5915,16 @@ u32 GetDynamicMoveType(struct Pokemon *mon, u32 move, u32 battler, u8 *ateBoost)
return TYPE_MYSTERY;
}
else if (moveEffect == EFFECT_RAGING_BULL
&& (species == SPECIES_TAUROS_PALDEAN_COMBAT_BREED
|| species == SPECIES_TAUROS_PALDEAN_BLAZE_BREED
|| species == SPECIES_TAUROS_PALDEAN_AQUA_BREED))
&& (species == SPECIES_TAUROS_PALDEA_COMBAT
|| species == SPECIES_TAUROS_PALDEA_BLAZE
|| species == SPECIES_TAUROS_PALDEA_AQUA))
{
return type2;
}
else if (moveEffect == EFFECT_IVY_CUDGEL
&& (species == SPECIES_OGERPON_WELLSPRING_MASK || species == SPECIES_OGERPON_WELLSPRING_MASK_TERA
|| species == SPECIES_OGERPON_HEARTHFLAME_MASK || species == SPECIES_OGERPON_HEARTHFLAME_MASK_TERA
|| species == SPECIES_OGERPON_CORNERSTONE_MASK || species == SPECIES_OGERPON_CORNERSTONE_MASK_TERA))
&& (species == SPECIES_OGERPON_WELLSPRING || species == SPECIES_OGERPON_WELLSPRING_TERA
|| species == SPECIES_OGERPON_HEARTHFLAME || species == SPECIES_OGERPON_HEARTHFLAME_TERA
|| species == SPECIES_OGERPON_CORNERSTONE || species == SPECIES_OGERPON_CORNERSTONE_TERA))
{
return type2;
}

8
src/battle_script_commands.c
View File

@ -2432,7 +2432,7 @@ static void Cmd_datahpupdate(void)
if (gBattleStruct->changedSpecies[side][gBattlerPartyIndexes[battler]] == SPECIES_NONE)
gBattleStruct->changedSpecies[side][gBattlerPartyIndexes[battler]] = gBattleMons[battler].species;
if (gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
gBattleMons[battler].species = SPECIES_MIMIKYU_TOTEM_BUSTED;
gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED_TOTEM;
else
gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
if (B_DISGUISE_HP_LOSS >= GEN_8)
@ -2617,7 +2617,7 @@ static void Cmd_resultmessage(void)
if (gBattleResources->flags->flags[gBattlerTarget] & RESOURCE_FLAG_ICE_FACE)
{
gBattleResources->flags->flags[gBattlerTarget] &= ~(RESOURCE_FLAG_ICE_FACE);
gBattleMons[gBattlerTarget].species = SPECIES_EISCUE_NOICE_FACE;
gBattleMons[gBattlerTarget].species = SPECIES_EISCUE_NOICE;
gBattleScripting.battler = gBattlerTarget; // For STRINGID_PKMNTRANSFORMED
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_IceFaceNullsDamage;
@ -15715,8 +15715,8 @@ static const u16 sTelekinesisBanList[] =
{
SPECIES_DIGLETT,
SPECIES_DUGTRIO,
SPECIES_DIGLETT_ALOLAN,
SPECIES_DUGTRIO_ALOLAN,
SPECIES_DIGLETT_ALOLA,
SPECIES_DUGTRIO_ALOLA,
SPECIES_SANDYGAST,
SPECIES_PALOSSAND,
SPECIES_GENGAR_MEGA,

8
src/battle_util.c
View File

@ -4972,11 +4972,11 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32
break;
case ABILITY_ICE_FACE:
if (IsBattlerWeatherAffected(battler, B_WEATHER_HAIL | B_WEATHER_SNOW)
&& gBattleMons[battler].species == SPECIES_EISCUE_NOICE_FACE
&& gBattleMons[battler].species == SPECIES_EISCUE_NOICE
&& !(gBattleMons[battler].status2 & STATUS2_TRANSFORMED))
{
// TODO: Convert this to a proper FORM_CHANGE type.
gBattleMons[battler].species = SPECIES_EISCUE_ICE_FACE;
gBattleMons[battler].species = SPECIES_EISCUE_ICE;
BattleScriptPushCursorAndCallback(BattleScript_BattlerFormChangeWithStringEnd3);
effect++;
}
@ -6339,12 +6339,12 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32
break;
case ABILITY_ICE_FACE:
if (IsBattlerWeatherAffected(battler, B_WEATHER_HAIL | B_WEATHER_SNOW)
&& gBattleMons[battler].species == SPECIES_EISCUE_NOICE_FACE
&& gBattleMons[battler].species == SPECIES_EISCUE_NOICE
&& !(gBattleMons[battler].status2 & STATUS2_TRANSFORMED))
{
// TODO: Convert this to a proper FORM_CHANGE type.
gBattleScripting.battler = battler;
gBattleMons[battler].species = SPECIES_EISCUE_ICE_FACE;
gBattleMons[battler].species = SPECIES_EISCUE_ICE;
BattleScriptPushCursorAndCallback(BattleScript_BattlerFormChangeWithStringEnd3);
effect++;
}

20
src/battle_z_move.c
View File

@ -56,10 +56,10 @@ static const struct SignatureZMove sSignatureZMoves[] =
{SPECIES_PIKACHU_ROCK_STAR, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA},
{SPECIES_PIKACHU_BELLE, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA},
{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_PHD, 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_RAICHU_ALOLA, 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},
@ -72,15 +72,15 @@ static const struct SignatureZMove sSignatureZMoves[] =
{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_MIMIKYU_TOTEM_DISGUISED, ITEM_MIMIKIUM_Z, MOVE_PLAY_ROUGH, MOVE_LETS_SNUGGLE_FOREVER},
{SPECIES_MIMIKYU_TOTEM_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},
{SPECIES_PIKACHU_SINNOH_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_UNOVA_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_KALOS_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_ALOLA_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_MIMIKYU_BUSTED_TOTEM, ITEM_MIMIKIUM_Z, MOVE_PLAY_ROUGH, MOVE_LETS_SNUGGLE_FOREVER},
{SPECIES_PIKACHU_ORIGINAL, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_HOENN, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_SINNOH, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_UNOVA, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_KALOS, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_ALOLA, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_PARTNER_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_WORLD_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PIKACHU_WORLD, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT},
{SPECIES_PRIMARINA, ITEM_PRIMARIUM_Z, MOVE_SPARKLING_ARIA, MOVE_OCEANIC_OPERETTA},
{SPECIES_SOLGALEO, ITEM_SOLGANIUM_Z, MOVE_SUNSTEEL_STRIKE, MOVE_SEARING_SUNRAZE_SMASH},
{SPECIES_NECROZMA_DUSK_MANE, ITEM_SOLGANIUM_Z, MOVE_SUNSTEEL_STRIKE, MOVE_SEARING_SUNRAZE_SMASH},

2
src/berry.c
View File

@ -2422,7 +2422,7 @@ static u16 GetBerryPestSpecies(u8 berryId)
return P_FAMILY_VOLBEAT_ILLUMISE ? SPECIES_ILLUMISE : SPECIES_NONE;
break;
case BERRY_COLOR_GREEN:
return P_FAMILY_BURMY ? SPECIES_BURMY_PLANT_CLOAK : SPECIES_NONE;
return P_FAMILY_BURMY ? SPECIES_BURMY_PLANT : SPECIES_NONE;
break;
case BERRY_COLOR_YELLOW:
return P_FAMILY_COMBEE ? SPECIES_COMBEE : SPECIES_NONE;

4
src/data/pokemon/form_change_table_pointers.h
View File

@ -24,11 +24,11 @@ const struct Fusion *const gFusionTablePointers[NUM_SPECIES] =
#if P_FAMILY_CALYREX
[SPECIES_CALYREX] = sCalyrexFusionTable,
#if P_FAMILY_SPECTRIER
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFusionTable,
[SPECIES_CALYREX_SHADOW] = sCalyrexFusionTable,
[SPECIES_SPECTRIER] = sCalyrexFusionTable,
#endif //P_FAMILY_SPECTRIER
#if P_FAMILY_GLASTRIER
[SPECIES_CALYREX_ICE_RIDER] = sCalyrexFusionTable,
[SPECIES_CALYREX_ICE] = sCalyrexFusionTable,
[SPECIES_GLASTRIER] = sCalyrexFusionTable,
#endif //P_FAMILY_GLASTRIER
#endif //P_FAMILY_CALYREX

144
src/data/pokemon/form_change_tables.h
View File

@ -4,7 +4,7 @@ static const struct FormChange sVenusaurFormChangeTable[] = {
{FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_VENUSAUR_MEGA, ITEM_VENUSAURITE},
#endif
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_VENUSAUR_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_VENUSAUR_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -17,7 +17,7 @@ static const struct FormChange sCharizardFormChangeTable[] = {
{FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_CHARIZARD_MEGA_Y, ITEM_CHARIZARDITE_Y},
#endif
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CHARIZARD_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CHARIZARD_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -29,7 +29,7 @@ static const struct FormChange sBlastoiseFormChangeTable[] = {
{FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_BLASTOISE_MEGA, ITEM_BLASTOISINITE},
#endif
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BLASTOISE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BLASTOISE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -39,7 +39,7 @@ static const struct FormChange sBlastoiseFormChangeTable[] = {
static const struct FormChange sButterfreeFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BUTTERFREE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BUTTERFREE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -67,7 +67,7 @@ static const struct FormChange sPidgeotFormChangeTable[] = {
static const struct FormChange sPikachuFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_PIKACHU_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_PIKACHU_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -77,7 +77,7 @@ static const struct FormChange sPikachuFormChangeTable[] =
static const struct FormChange sMeowthFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MEOWTH_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MEOWTH_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -96,7 +96,7 @@ static const struct FormChange sAlakazamFormChangeTable[] = {
static const struct FormChange sMachampFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MACHAMP_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MACHAMP_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -117,7 +117,7 @@ static const struct FormChange sGengarFormChangeTable[] = {
{FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_GENGAR_MEGA, ITEM_GENGARITE},
#endif
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GENGAR_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GENGAR_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -138,7 +138,7 @@ static const struct FormChange sSteelixFormChangeTable[] = {
static const struct FormChange sKinglerFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_KINGLER_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_KINGLER_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -185,7 +185,7 @@ static const struct FormChange sGyaradosFormChangeTable[] = {
#if P_FAMILY_LAPRAS
static const struct FormChange sLaprasFormChangeTable[] = {
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_LAPRAS_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_LAPRAS_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -194,7 +194,7 @@ static const struct FormChange sLaprasFormChangeTable[] = {
#if P_FAMILY_EEVEE
static const struct FormChange sEeveeFormChangeTable[] = {
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_EEVEE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_EEVEE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -212,7 +212,7 @@ static const struct FormChange sAerodactylFormChangeTable[] = {
#if P_FAMILY_SNORLAX
static const struct FormChange sSnorlaxFormChangeTable[] = {
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_SNORLAX_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_SNORLAX_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -517,14 +517,14 @@ static const struct FormChange sDeoxysSpeedFormChangeTable[] = {
#if P_FAMILY_BURMY
static const struct FormChange sBurmyFormChangeTable[] = {
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_GRASS},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_LONG_GRASS},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_POND},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_MOUNTAIN},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_PLAIN},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_SANDY_CLOAK, BATTLE_TERRAIN_CAVE},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_SANDY_CLOAK, BATTLE_TERRAIN_SAND},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_TRASH_CLOAK, BATTLE_TERRAIN_BUILDING},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT, BATTLE_TERRAIN_GRASS},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT, BATTLE_TERRAIN_LONG_GRASS},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT, BATTLE_TERRAIN_POND},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT, BATTLE_TERRAIN_MOUNTAIN},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT, BATTLE_TERRAIN_PLAIN},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_SANDY, BATTLE_TERRAIN_CAVE},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_SANDY, BATTLE_TERRAIN_SAND},
{FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_TRASH, BATTLE_TERRAIN_BUILDING},
{FORM_CHANGE_TERMINATOR},
};
#endif //P_FAMILY_BURMY
@ -684,19 +684,19 @@ static const struct FormChange sAudinoFormChangeTable[] = {
#if P_FAMILY_DARUMAKA
static const struct FormChange sDarmanitanFormChangeTable[] = {
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_STANDARD_MODE, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50},
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_ZEN_MODE, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50},
{FORM_CHANGE_FAINT, SPECIES_DARMANITAN_STANDARD_MODE},
{FORM_CHANGE_END_BATTLE, SPECIES_DARMANITAN_STANDARD_MODE},
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_STANDARD, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50},
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_ZEN, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50},
{FORM_CHANGE_FAINT, SPECIES_DARMANITAN_STANDARD},
{FORM_CHANGE_END_BATTLE, SPECIES_DARMANITAN_STANDARD},
{FORM_CHANGE_TERMINATOR},
};
#if P_GALARIAN_FORMS
static const struct FormChange sDarmanitanGalarianFormChangeTable[] = {
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50},
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50},
{FORM_CHANGE_FAINT, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE},
{FORM_CHANGE_END_BATTLE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE},
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALAR_STANDARD, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50},
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALAR_ZEN, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50},
{FORM_CHANGE_FAINT, SPECIES_DARMANITAN_GALAR_STANDARD},
{FORM_CHANGE_END_BATTLE, SPECIES_DARMANITAN_GALAR_STANDARD},
{FORM_CHANGE_TERMINATOR},
};
#endif //P_GALARIAN_FORMS
@ -706,7 +706,7 @@ static const struct FormChange sDarmanitanGalarianFormChangeTable[] = {
static const struct FormChange sGarbodorFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GARBODOR_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GARBODOR_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -763,10 +763,10 @@ static const struct FormChange sMeloettaFormChangeTable[] = {
#if P_FAMILY_GENESECT
static const struct FormChange sGenesectFormChangeTable[] = {
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT, ITEM_NONE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT_DOUSE_DRIVE, ITEM_DOUSE_DRIVE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT_SHOCK_DRIVE, ITEM_SHOCK_DRIVE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT_BURN_DRIVE, ITEM_BURN_DRIVE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT_CHILL_DRIVE, ITEM_CHILL_DRIVE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT_DOUSE, ITEM_DOUSE_DRIVE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT_SHOCK, ITEM_SHOCK_DRIVE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT_BURN, ITEM_BURN_DRIVE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_GENESECT_CHILL, ITEM_CHILL_DRIVE},
{FORM_CHANGE_TERMINATOR},
};
#endif //P_FAMILY_GENESECT
@ -812,14 +812,14 @@ static const struct FormChange sZygarde50AuraBreakFormChangeTable[] = {
};
static const struct FormChange sZygarde10AuraBreakFormChangeTable[] = {
{FORM_CHANGE_ITEM_USE_MULTICHOICE, SPECIES_ZYGARDE_50_AURA_BREAK, ITEM_ZYGARDE_CUBE, 0},
{FORM_CHANGE_ITEM_USE_MULTICHOICE, SPECIES_ZYGARDE_50, ITEM_ZYGARDE_CUBE, 0},
{FORM_CHANGE_ITEM_USE_MULTICHOICE, SPECIES_ZYGARDE_10_POWER_CONSTRUCT, ITEM_ZYGARDE_CUBE, 1},
{FORM_CHANGE_TERMINATOR},
};
static const struct FormChange sZygarde50PowerConstructFormChangeTable[] = {
{FORM_CHANGE_ITEM_USE_MULTICHOICE, SPECIES_ZYGARDE_10_POWER_CONSTRUCT, ITEM_ZYGARDE_CUBE, 0},
{FORM_CHANGE_ITEM_USE_MULTICHOICE, SPECIES_ZYGARDE_50_AURA_BREAK, ITEM_ZYGARDE_CUBE, 1},
{FORM_CHANGE_ITEM_USE_MULTICHOICE, SPECIES_ZYGARDE_50, ITEM_ZYGARDE_CUBE, 1},
{FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_ZYGARDE_COMPLETE, ABILITY_POWER_CONSTRUCT, HP_LOWER_EQ_THAN, 50},
{FORM_CHANGE_TERMINATOR},
};
@ -999,7 +999,7 @@ static const struct FormChange sNecrozmaDawnWingsFormChangeTable[] = {
static const struct FormChange sMelmetalFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MELMETAL_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MELMETAL_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1009,7 +1009,7 @@ static const struct FormChange sMelmetalFormChangeTable[] =
static const struct FormChange sRillaboomFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_RILLABOOM_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_RILLABOOM_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1019,7 +1019,7 @@ static const struct FormChange sRillaboomFormChangeTable[] =
static const struct FormChange sCinderaceFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CINDERACE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CINDERACE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1029,7 +1029,7 @@ static const struct FormChange sCinderaceFormChangeTable[] =
static const struct FormChange sInteleonFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_INTELEON_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_INTELEON_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1039,7 +1039,7 @@ static const struct FormChange sInteleonFormChangeTable[] =
static const struct FormChange sCorviknightFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CORVIKNIGHT_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CORVIKNIGHT_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1049,7 +1049,7 @@ static const struct FormChange sCorviknightFormChangeTable[] =
static const struct FormChange sOrbeetleFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_ORBEETLE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_ORBEETLE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1059,7 +1059,7 @@ static const struct FormChange sOrbeetleFormChangeTable[] =
static const struct FormChange sDrednawFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_DREDNAW_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_DREDNAW_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1069,7 +1069,7 @@ static const struct FormChange sDrednawFormChangeTable[] =
static const struct FormChange sCoalossalFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_COALOSSAL_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_COALOSSAL_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1079,7 +1079,7 @@ static const struct FormChange sCoalossalFormChangeTable[] =
static const struct FormChange sFlappleFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_FLAPPLE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_FLAPPLE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1087,7 +1087,7 @@ static const struct FormChange sFlappleFormChangeTable[] =
static const struct FormChange sAppletunFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_APPLETUN_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_APPLETUN_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1097,7 +1097,7 @@ static const struct FormChange sAppletunFormChangeTable[] =
static const struct FormChange sSandacondaFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_SANDACONDA_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_SANDACONDA_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1119,7 +1119,7 @@ static const struct FormChange sCramorantFormChangeTable[] = {
static const struct FormChange sToxtricityAmpedFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_TOXTRICITY_AMPED_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_TOXTRICITY_AMPED_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1127,7 +1127,7 @@ static const struct FormChange sToxtricityAmpedFormChangeTable[] =
static const struct FormChange sToxtricityLowKeyFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_TOXTRICITY_LOW_KEY_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1137,7 +1137,7 @@ static const struct FormChange sToxtricityLowKeyFormChangeTable[] =
static const struct FormChange sCentiskorchFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CENTISKORCH_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CENTISKORCH_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1147,7 +1147,7 @@ static const struct FormChange sCentiskorchFormChangeTable[] =
static const struct FormChange sHattereneFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_HATTERENE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_HATTERENE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1157,7 +1157,7 @@ static const struct FormChange sHattereneFormChangeTable[] =
static const struct FormChange sGrimmsnarlFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GRIMMSNARL_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GRIMMSNARL_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1167,7 +1167,7 @@ static const struct FormChange sGrimmsnarlFormChangeTable[] =
static const struct FormChange sAlcremieFormChangeTable[] =
{
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_ALCREMIE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_ALCREMIE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1175,8 +1175,8 @@ static const struct FormChange sAlcremieFormChangeTable[] =
#if P_FAMILY_EISCUE
static const struct FormChange sEiscueFormChangeTable[] = {
{FORM_CHANGE_FAINT, SPECIES_EISCUE_ICE_FACE},
{FORM_CHANGE_END_BATTLE, SPECIES_EISCUE_ICE_FACE},
{FORM_CHANGE_FAINT, SPECIES_EISCUE_ICE},
{FORM_CHANGE_END_BATTLE, SPECIES_EISCUE_ICE},
{FORM_CHANGE_TERMINATOR},
};
#endif //P_FAMILY_EISCUE
@ -1195,7 +1195,7 @@ static const struct FormChange sMorpekoFormChangeTable[] = {
#if P_FAMILY_CUFANT
static const struct FormChange sCopperajahFormChangeTable[] = {
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_COPPERAJAH_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_COPPERAJAH_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1204,7 +1204,7 @@ static const struct FormChange sCopperajahFormChangeTable[] = {
#if P_FAMILY_DURALUDON
static const struct FormChange sDuraludonFormChangeTable[] = {
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_DURALUDON_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_DURALUDON_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1212,16 +1212,16 @@ static const struct FormChange sDuraludonFormChangeTable[] = {
#if P_FAMILY_ZACIAN
static const struct FormChange sZacianFormChangeTable[] = {
{FORM_CHANGE_BEGIN_BATTLE, SPECIES_ZACIAN_CROWNED_SWORD, ITEM_RUSTED_SWORD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BLADE},
{FORM_CHANGE_END_BATTLE, SPECIES_ZACIAN_HERO_OF_MANY_BATTLES, ITEM_RUSTED_SWORD, MOVE_BEHEMOTH_BLADE, MOVE_IRON_HEAD},
{FORM_CHANGE_BEGIN_BATTLE, SPECIES_ZACIAN_CROWNED, ITEM_RUSTED_SWORD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BLADE},
{FORM_CHANGE_END_BATTLE, SPECIES_ZACIAN_HERO, ITEM_RUSTED_SWORD, MOVE_BEHEMOTH_BLADE, MOVE_IRON_HEAD},
{FORM_CHANGE_TERMINATOR},
};
#endif //P_FAMILY_ZACIAN
#if P_FAMILY_ZAMAZENTA
static const struct FormChange sZamazentaFormChangeTable[] = {
{FORM_CHANGE_BEGIN_BATTLE, SPECIES_ZAMAZENTA_CROWNED_SHIELD, ITEM_RUSTED_SHIELD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BASH},
{FORM_CHANGE_END_BATTLE, SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES, ITEM_RUSTED_SHIELD, MOVE_BEHEMOTH_BASH, MOVE_IRON_HEAD},
{FORM_CHANGE_BEGIN_BATTLE, SPECIES_ZAMAZENTA_CROWNED, ITEM_RUSTED_SHIELD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BASH},
{FORM_CHANGE_END_BATTLE, SPECIES_ZAMAZENTA_HERO, ITEM_RUSTED_SHIELD, MOVE_BEHEMOTH_BASH, MOVE_IRON_HEAD},
{FORM_CHANGE_TERMINATOR},
};
#endif //P_FAMILY_ZAMAZENTA
@ -1229,14 +1229,14 @@ static const struct FormChange sZamazentaFormChangeTable[] = {
#if P_FAMILY_KUBFU
static const struct FormChange sUrshifuSingleStrikeFormChangeTable[] = {
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_URSHIFU_SINGLE_STRIKE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
static const struct FormChange sUrshifuRapidStrikeFormChangeTable[] = {
#if P_GIGANTAMAX_FORMS
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX},
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_URSHIFU_RAPID_STRIKE_GMAX},
#endif
{FORM_CHANGE_TERMINATOR},
};
@ -1244,8 +1244,8 @@ static const struct FormChange sUrshifuRapidStrikeFormChangeTable[] = {
#if P_FAMILY_CALYREX
static const struct Fusion sCalyrexFusionTable[] = {
{3, ITEM_REINS_OF_UNITY, SPECIES_CALYREX, SPECIES_GLASTRIER, SPECIES_CALYREX_ICE_RIDER, MOVE_GLACIAL_LANCE, MOVE_CONFUSION},
{3, ITEM_REINS_OF_UNITY, SPECIES_CALYREX, SPECIES_SPECTRIER, SPECIES_CALYREX_SHADOW_RIDER, MOVE_ASTRAL_BARRAGE, MOVE_CONFUSION},
{3, ITEM_REINS_OF_UNITY, SPECIES_CALYREX, SPECIES_GLASTRIER, SPECIES_CALYREX_ICE, MOVE_GLACIAL_LANCE, MOVE_CONFUSION},
{3, ITEM_REINS_OF_UNITY, SPECIES_CALYREX, SPECIES_SPECTRIER, SPECIES_CALYREX_SHADOW, MOVE_ASTRAL_BARRAGE, MOVE_CONFUSION},
{FUSION_TERMINATOR},
};
#endif //P_FAMILY_CALYREX
@ -1268,15 +1268,15 @@ static const struct FormChange sPalafinZeroFormChangeTable[] =
#if P_FAMILY_OGERPON
static const struct FormChange sOgerponFormChangeTable[] = {
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_TEAL_MASK, ITEM_NONE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_WELLSPRING_MASK, ITEM_WELLSPRING_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_HEARTHFLAME_MASK, ITEM_HEARTHFLAME_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_CORNERSTONE_MASK, ITEM_CORNERSTONE_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_TEAL, ITEM_NONE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_WELLSPRING, ITEM_WELLSPRING_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_HEARTHFLAME, ITEM_HEARTHFLAME_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_CORNERSTONE, ITEM_CORNERSTONE_MASK},
#if P_TERA_FORMS
{FORM_CHANGE_BATTLE_TERASTALLIZATION, SPECIES_OGERPON_TEAL_MASK_TERA, TYPE_GRASS},
{FORM_CHANGE_BATTLE_TERASTALLIZATION, SPECIES_OGERPON_WELLSPRING_MASK_TERA, TYPE_WATER},
{FORM_CHANGE_BATTLE_TERASTALLIZATION, SPECIES_OGERPON_HEARTHFLAME_MASK_TERA, TYPE_FIRE},
{FORM_CHANGE_BATTLE_TERASTALLIZATION, SPECIES_OGERPON_CORNERSTONE_MASK_TERA, TYPE_ROCK},
{FORM_CHANGE_BATTLE_TERASTALLIZATION, SPECIES_OGERPON_TEAL_TERA, TYPE_GRASS},
{FORM_CHANGE_BATTLE_TERASTALLIZATION, SPECIES_OGERPON_WELLSPRING_TERA, TYPE_WATER},
{FORM_CHANGE_BATTLE_TERASTALLIZATION, SPECIES_OGERPON_HEARTHFLAME_TERA, TYPE_FIRE},
{FORM_CHANGE_BATTLE_TERASTALLIZATION, SPECIES_OGERPON_CORNERSTONE_TERA, TYPE_ROCK},
#endif
{FORM_CHANGE_TERMINATOR},
};

358
src/data/pokemon/form_species_tables.h
View File

File diff suppressed because it is too large Load Diff

16
src/data/pokemon/pokedex_orders.h
View File

@ -1366,16 +1366,16 @@ const u16 gPokedexOrder_Weight[] =
//NATIONAL_DEX_PIKACHU_ROCK_STAR,
//NATIONAL_DEX_PIKACHU_BELLE,
//NATIONAL_DEX_PIKACHU_POP_STAR,
//NATIONAL_DEX_PIKACHU_PH_D,
//NATIONAL_DEX_PIKACHU_PHD,
//NATIONAL_DEX_PIKACHU_LIBRE,
//NATIONAL_DEX_PIKACHU_ORIGINAL_CAP,
//NATIONAL_DEX_PIKACHU_HOENN_CAP,
//NATIONAL_DEX_PIKACHU_SINNOH_CAP,
//NATIONAL_DEX_PIKACHU_UNOVA_CAP,
//NATIONAL_DEX_PIKACHU_KALOS_CAP,
//NATIONAL_DEX_PIKACHU_ALOLA_CAP,
//NATIONAL_DEX_PIKACHU_ORIGINAL,
//NATIONAL_DEX_PIKACHU_HOENN,
//NATIONAL_DEX_PIKACHU_SINNOH,
//NATIONAL_DEX_PIKACHU_UNOVA,
//NATIONAL_DEX_PIKACHU_KALOS,
//NATIONAL_DEX_PIKACHU_ALOLA,
//NATIONAL_DEX_PIKACHU_PARTNER_CAP,
//NATIONAL_DEX_PIKACHU_WORLD_CAP,
//NATIONAL_DEX_PIKACHU_WORLD,
NATIONAL_DEX_MAGNEMITE,
NATIONAL_DEX_SENTRET,
NATIONAL_DEX_SMOOCHUM,

164
src/data/pokemon/species_info/gen_1_families.h
View File

@ -263,7 +263,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_MEGA_EVOLUTIONS
#if P_GIGANTAMAX_FORMS
[SPECIES_VENUSAUR_GIGANTAMAX] =
[SPECIES_VENUSAUR_GMAX] =
{
.baseHP = 80,
.baseAttack = 82,
@ -632,7 +632,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_MEGA_EVOLUTIONS
#if P_GIGANTAMAX_FORMS
[SPECIES_CHARIZARD_GIGANTAMAX] =
[SPECIES_CHARIZARD_GMAX] =
{
.baseHP = 78,
.baseAttack = 84,
@ -946,7 +946,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_MEGA_EVOLUTIONS
#if P_GIGANTAMAX_FORMS
[SPECIES_BLASTOISE_GIGANTAMAX] =
[SPECIES_BLASTOISE_GMAX] =
{
.baseHP = 79,
.baseAttack = 83,
@ -1212,7 +1212,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_BUTTERFREE_GIGANTAMAX] =
[SPECIES_BUTTERFREE_GMAX] =
{
.baseHP = 60,
.baseAttack = 45,
@ -1948,7 +1948,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_RATTATA_ALOLAN] =
[SPECIES_RATTATA_ALOLA] =
{
.baseHP = 30,
.baseAttack = 56,
@ -2011,11 +2011,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sRattataAlolanTeachableLearnset,
.eggMoveLearnset = sRattataAlolanEggMoveLearnset,
.formSpeciesIdTable = sRattataFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN},
{EVO_NONE, 0, SPECIES_RATICATE_ALOLAN_TOTEM}),
.evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLA},
{EVO_NONE, 0, SPECIES_RATICATE_ALOLA_TOTEM}),
},
[SPECIES_RATICATE_ALOLAN] =
[SPECIES_RATICATE_ALOLA] =
{
.baseHP = 75,
.baseAttack = 71,
@ -2075,7 +2075,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sRaticateFormSpeciesIdTable,
},
[SPECIES_RATICATE_ALOLAN_TOTEM] =
[SPECIES_RATICATE_ALOLA_TOTEM] =
{
.baseHP = 75,
.baseAttack = 71,
@ -2602,7 +2602,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sPikachuFormSpeciesIdTable,
.formChangeTable = sPikachuFormChangeTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU},
{EVO_NONE, 0, SPECIES_RAICHU_ALOLAN}),
{EVO_NONE, 0, SPECIES_RAICHU_ALOLA}),
},
#if P_COSPLAY_PIKACHU_FORMS
@ -2812,7 +2812,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sPikachuFormSpeciesIdTable,
},
[SPECIES_PIKACHU_PH_D] =
[SPECIES_PIKACHU_PHD] =
{
.baseHP = 35,
.baseAttack = 55,
@ -2917,7 +2917,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_COSPLAY_PIKACHU_FORMS
#if P_CAP_PIKACHU_FORMS
[SPECIES_PIKACHU_ORIGINAL_CAP] =
[SPECIES_PIKACHU_ORIGINAL] =
{
.baseHP = 35,
.baseAttack = 55,
@ -2973,7 +2973,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sPikachuFormSpeciesIdTable,
},
[SPECIES_PIKACHU_HOENN_CAP] =
[SPECIES_PIKACHU_HOENN] =
{
.baseHP = 35,
.baseAttack = 55,
@ -3028,7 +3028,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sPikachuFormSpeciesIdTable,
},
[SPECIES_PIKACHU_SINNOH_CAP] =
[SPECIES_PIKACHU_SINNOH] =
{
.baseHP = 35,
.baseAttack = 55,
@ -3083,7 +3083,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sPikachuFormSpeciesIdTable,
},
[SPECIES_PIKACHU_UNOVA_CAP] =
[SPECIES_PIKACHU_UNOVA] =
{
.baseHP = 35,
.baseAttack = 55,
@ -3138,7 +3138,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sPikachuFormSpeciesIdTable,
},
[SPECIES_PIKACHU_KALOS_CAP] =
[SPECIES_PIKACHU_KALOS] =
{
.baseHP = 35,
.baseAttack = 55,
@ -3193,7 +3193,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sPikachuFormSpeciesIdTable,
},
[SPECIES_PIKACHU_ALOLA_CAP] =
[SPECIES_PIKACHU_ALOLA] =
{
.baseHP = 35,
.baseAttack = 55,
@ -3304,7 +3304,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sPikachuFormSpeciesIdTable,
},
[SPECIES_PIKACHU_WORLD_CAP] =
[SPECIES_PIKACHU_WORLD] =
{
.baseHP = 35,
.baseAttack = 55,
@ -3362,7 +3362,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_CAP_PIKACHU_FORMS
#if P_GIGANTAMAX_FORMS
[SPECIES_PIKACHU_GIGANTAMAX] =
[SPECIES_PIKACHU_GMAX] =
{
.baseHP = 35,
.baseAttack = 55,
@ -3420,7 +3420,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#endif //P_GIGANTAMAX_FORMS
[SPECIES_PIKACHU_PARTNER] =
[SPECIES_PIKACHU_STARTER] =
{
.baseHP = 45,
.baseAttack = 80,
@ -3567,7 +3567,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_RAICHU_ALOLAN] =
[SPECIES_RAICHU_ALOLA] =
{
.baseHP = 60,
.baseAttack = 85,
@ -3763,7 +3763,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_SANDSHREW_ALOLAN] =
[SPECIES_SANDSHREW_ALOLA] =
{
.baseHP = 50,
.baseAttack = 75,
@ -3826,10 +3826,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sSandshrewAlolanTeachableLearnset,
.eggMoveLearnset = sSandshrewAlolanEggMoveLearnset,
.formSpeciesIdTable = sSandshrewFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLA}),
},
[SPECIES_SANDSLASH_ALOLAN] =
[SPECIES_SANDSLASH_ALOLA] =
{
.baseHP = 75,
.baseAttack = 100,
@ -4664,7 +4664,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_VULPIX_ALOLAN] =
[SPECIES_VULPIX_ALOLA] =
{
.baseHP = 38,
.baseAttack = 41,
@ -4727,10 +4727,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sVulpixAlolanTeachableLearnset,
.eggMoveLearnset = sVulpixAlolanEggMoveLearnset,
.formSpeciesIdTable = sVulpixFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLA}),
},
[SPECIES_NINETALES_ALOLAN] =
[SPECIES_NINETALES_ALOLA] =
{
.baseHP = 73,
.baseAttack = 67,
@ -5927,7 +5927,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_DIGLETT_ALOLAN] =
[SPECIES_DIGLETT_ALOLA] =
{
.baseHP = 10,
.baseAttack = 55,
@ -5990,10 +5990,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sDiglettAlolanTeachableLearnset,
.eggMoveLearnset = sDiglettAlolanEggMoveLearnset,
.formSpeciesIdTable = sDiglettFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}),
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLA}),
},
[SPECIES_DUGTRIO_ALOLAN] =
[SPECIES_DUGTRIO_ALOLA] =
{
.baseHP = 35,
.baseAttack = DUGTRIO_ATTACK,
@ -6201,7 +6201,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_MEOWTH_ALOLAN] =
[SPECIES_MEOWTH_ALOLA] =
{
.baseHP = 40,
.baseAttack = 35,
@ -6264,10 +6264,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sMeowthAlolanTeachableLearnset,
.eggMoveLearnset = sMeowthAlolanEggMoveLearnset,
.formSpeciesIdTable = sMeowthFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_ALOLAN}),
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_ALOLA}),
},
[SPECIES_PERSIAN_ALOLAN] =
[SPECIES_PERSIAN_ALOLA] =
{
.baseHP = 65,
.baseAttack = 60,
@ -6333,7 +6333,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_ALOLAN_FORMS
#if P_GALARIAN_FORMS
[SPECIES_MEOWTH_GALARIAN] =
[SPECIES_MEOWTH_GALAR] =
{
.baseHP = 50,
.baseAttack = 65,
@ -6460,7 +6460,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_GALARIAN_FORMS
#if P_GIGANTAMAX_FORMS
[SPECIES_MEOWTH_GIGANTAMAX] =
[SPECIES_MEOWTH_GMAX] =
{
.baseHP = 40,
.baseAttack = 45,
@ -6975,7 +6975,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_HISUIAN_FORMS
[SPECIES_GROWLITHE_HISUIAN] =
[SPECIES_GROWLITHE_HISUI] =
{
.baseHP = 60,
.baseAttack = 75,
@ -7036,10 +7036,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.levelUpLearnset = sGrowlitheHisuianLevelUpLearnset,
.teachableLearnset = sGrowlitheHisuianTeachableLearnset,
.formSpeciesIdTable = sGrowlitheFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE_HISUIAN}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE_HISUI}),
},
[SPECIES_ARCANINE_HISUIAN] =
[SPECIES_ARCANINE_HISUI] =
{
.baseHP = 95,
.baseAttack = 115,
@ -7883,7 +7883,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_MACHAMP_GIGANTAMAX] =
[SPECIES_MACHAMP_GMAX] =
{
.baseHP = 90,
.baseAttack = 130,
@ -8488,7 +8488,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_GEODUDE_ALOLAN] =
[SPECIES_GEODUDE_ALOLA] =
{
.baseHP = 40,
.baseAttack = 80,
@ -8552,10 +8552,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sGeodudeAlolanTeachableLearnset,
.eggMoveLearnset = sGeodudeAlolanEggMoveLearnset,
.formSpeciesIdTable = sGeodudeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}),
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLA}),
},
[SPECIES_GRAVELER_ALOLAN] =
[SPECIES_GRAVELER_ALOLA] =
{
.baseHP = 55,
.baseAttack = 95,
@ -8617,11 +8617,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.levelUpLearnset = sGravelerAlolanLevelUpLearnset,
.teachableLearnset = sGravelerAlolanTeachableLearnset,
.formSpeciesIdTable = sGravelerFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN},
{EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOLEM_ALOLAN}),
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOLEM_ALOLA},
{EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOLEM_ALOLA}),
},
[SPECIES_GOLEM_ALOLAN] =
[SPECIES_GOLEM_ALOLA] =
{
.baseHP = 80,
.baseAttack = GOLEM_ATTACK,
@ -8816,7 +8816,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GALARIAN_FORMS
[SPECIES_PONYTA_GALARIAN] =
[SPECIES_PONYTA_GALAR] =
{
.baseHP = 50,
.baseAttack = 85,
@ -8878,10 +8878,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sPonytaGalarianTeachableLearnset,
.eggMoveLearnset = sPonytaGalarianEggMoveLearnset,
.formSpeciesIdTable = sPonytaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}),
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH_GALAR}),
},
[SPECIES_RAPIDASH_GALARIAN] =
[SPECIES_RAPIDASH_GALAR] =
{
.baseHP = 65,
.baseAttack = 100,
@ -9203,7 +9203,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_MEGA_EVOLUTIONS
#if P_GALARIAN_FORMS
[SPECIES_SLOWPOKE_GALARIAN] =
[SPECIES_SLOWPOKE_GALAR] =
{
.baseHP = 90,
.baseAttack = 65,
@ -9265,11 +9265,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sSlowpokeGalarianTeachableLearnset,
.eggMoveLearnset = sSlowpokeGalarianEggMoveLearnset,
.formSpeciesIdTable = sSlowpokeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN},
{EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALAR},
{EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALAR}),
},
[SPECIES_SLOWBRO_GALARIAN] =
[SPECIES_SLOWBRO_GALAR] =
{
.baseHP = 95,
.baseAttack = 100,
@ -9335,7 +9335,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GEN_2_CROSS_EVOS
[SPECIES_SLOWKING_GALARIAN] =
[SPECIES_SLOWKING_GALAR] =
{
.baseHP = 95,
.baseAttack = 65,
@ -9680,7 +9680,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GALARIAN_FORMS
[SPECIES_FARFETCHD_GALARIAN] =
[SPECIES_FARFETCHD_GALAR] =
{
.baseHP = 52,
.baseAttack = FARFETCHD_ATTACK + 5,
@ -10218,7 +10218,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_GRIMER_ALOLAN] =
[SPECIES_GRIMER_ALOLA] =
{
.baseHP = 80,
.baseAttack = 80,
@ -10281,10 +10281,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sGrimerAlolanTeachableLearnset,
.eggMoveLearnset = sGrimerAlolanEggMoveLearnset,
.formSpeciesIdTable = sGrimerFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}),
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK_ALOLA}),
},
[SPECIES_MUK_ALOLAN] =
[SPECIES_MUK_ALOLA] =
{
.baseHP = 105,
.baseAttack = 105,
@ -10755,7 +10755,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#endif //P_MEGA_EVOLUTIONS
#if P_GIGANTAMAX_FORMS
[SPECIES_GENGAR_GIGANTAMAX] =
[SPECIES_GENGAR_GMAX] =
{
.baseHP = 60,
.baseAttack = 65,
@ -11279,7 +11279,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_KINGLER_GIGANTAMAX] =
[SPECIES_KINGLER_GMAX] =
{
.baseHP = 55,
.baseAttack = 130,
@ -11473,7 +11473,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_HISUIAN_FORMS
[SPECIES_VOLTORB_HISUIAN] =
[SPECIES_VOLTORB_HISUI] =
{
.baseHP = 40,
.baseAttack = 30,
@ -11534,10 +11534,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.levelUpLearnset = sVoltorbHisuianLevelUpLearnset,
.teachableLearnset = sVoltorbHisuianTeachableLearnset,
.formSpeciesIdTable = sVoltorbFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_ELECTRODE_HISUIAN}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_ELECTRODE_HISUI}),
},
[SPECIES_ELECTRODE_HISUIAN] =
[SPECIES_ELECTRODE_HISUI] =
{
.baseHP = 60,
.baseAttack = 50,
@ -11665,7 +11665,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sExeggcuteTeachableLearnset,
.eggMoveLearnset = sExeggcuteEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR},
{EVO_NONE, 0, SPECIES_EXEGGUTOR_ALOLAN}),
{EVO_NONE, 0, SPECIES_EXEGGUTOR_ALOLA}),
},
#if P_UPDATED_EXP_YIELDS >= GEN_7
@ -11741,7 +11741,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_EXEGGUTOR_ALOLAN] =
[SPECIES_EXEGGUTOR_ALOLA] =
{
.baseHP = 95,
.baseAttack = 105,
@ -11870,8 +11870,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sCuboneTeachableLearnset,
.eggMoveLearnset = sCuboneEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MAROWAK},
{EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN},
{EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN_TOTEM}),
{EVO_NONE, 0, SPECIES_MAROWAK_ALOLA},
{EVO_NONE, 0, SPECIES_MAROWAK_ALOLA_TOTEM}),
},
[SPECIES_MAROWAK] =
@ -11938,7 +11938,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_ALOLAN_FORMS
[SPECIES_MAROWAK_ALOLAN] =
[SPECIES_MAROWAK_ALOLA] =
{
.baseHP = 60,
.baseAttack = 80,
@ -11998,7 +11998,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sMarowakFormSpeciesIdTable,
},
[SPECIES_MAROWAK_ALOLAN_TOTEM] =
[SPECIES_MAROWAK_ALOLA_TOTEM] =
{
.baseHP = 60,
.baseAttack = 80,
@ -12530,7 +12530,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sKoffingTeachableLearnset,
.eggMoveLearnset = sKoffingEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_WEEZING},
{EVO_NONE, 0, SPECIES_WEEZING_GALARIAN}),
{EVO_NONE, 0, SPECIES_WEEZING_GALAR}),
},
[SPECIES_WEEZING] =
@ -12603,7 +12603,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GALARIAN_FORMS
[SPECIES_WEEZING_GALARIAN] =
[SPECIES_WEEZING_GALAR] =
{
.baseHP = 65,
.baseAttack = 90,
@ -13888,7 +13888,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sMimeJrTeachableLearnset,
.eggMoveLearnset = sMimeJrEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME},
{EVO_NONE, 0, SPECIES_MR_MIME_GALARIAN}),
{EVO_NONE, 0, SPECIES_MR_MIME_GALAR}),
},
#endif //P_GEN_4_CROSS_EVOS
@ -13960,7 +13960,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GALARIAN_FORMS
[SPECIES_MR_MIME_GALARIAN] =
[SPECIES_MR_MIME_GALAR] =
{
.baseHP = 50,
.baseAttack = 65,
@ -15099,7 +15099,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_PALDEAN_FORMS
[SPECIES_TAUROS_PALDEAN_COMBAT_BREED] =
[SPECIES_TAUROS_PALDEA_COMBAT] =
{
.baseHP = 75,
.baseAttack = 110,
@ -15163,7 +15163,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sTaurosFormSpeciesIdTable,
},
[SPECIES_TAUROS_PALDEAN_BLAZE_BREED] =
[SPECIES_TAUROS_PALDEA_BLAZE] =
{
.baseHP = 75,
.baseAttack = 110,
@ -15227,7 +15227,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formSpeciesIdTable = sTaurosFormSpeciesIdTable,
},
[SPECIES_TAUROS_PALDEAN_AQUA_BREED] =
[SPECIES_TAUROS_PALDEA_AQUA] =
{
.baseHP = 75,
.baseAttack = 110,
@ -15556,7 +15556,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_LAPRAS_GIGANTAMAX] =
[SPECIES_LAPRAS_GMAX] =
{
.baseHP = 130,
.baseAttack = 85,
@ -15763,7 +15763,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_EEVEE_GIGANTAMAX] =
[SPECIES_EEVEE_GMAX] =
{
.baseHP = 55,
.baseAttack = 55,
@ -15821,7 +15821,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#endif //P_GIGANTAMAX_FORMS
[SPECIES_EEVEE_PARTNER] =
[SPECIES_EEVEE_STARTER] =
{
.baseHP = 65,
.baseAttack = 75,
@ -17126,7 +17126,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_SNORLAX_GIGANTAMAX] =
[SPECIES_SNORLAX_GMAX] =
{
.baseHP = 160,
.baseAttack = 110,
@ -17259,7 +17259,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GALARIAN_FORMS
[SPECIES_ARTICUNO_GALARIAN] =
[SPECIES_ARTICUNO_GALAR] =
{
.baseHP = 90,
.baseAttack = 85,
@ -17404,7 +17404,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GALARIAN_FORMS
[SPECIES_ZAPDOS_GALARIAN] =
[SPECIES_ZAPDOS_GALAR] =
{
.baseHP = 90,
.baseAttack = 125,
@ -17543,7 +17543,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_GALARIAN_FORMS
[SPECIES_MOLTRES_GALARIAN] =
[SPECIES_MOLTRES_GALAR] =
{
.baseHP = 90,
.baseAttack = 85,

68
src/data/pokemon/species_info/gen_2_families.h
View File

@ -328,7 +328,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sQuilavaLevelUpLearnset,
.teachableLearnset = sQuilavaTeachableLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_TYPHLOSION},
{EVO_NONE, 0, SPECIES_TYPHLOSION_HISUIAN}),
{EVO_NONE, 0, SPECIES_TYPHLOSION_HISUI}),
},
#if P_UPDATED_EXP_YIELDS >= GEN_8
@ -403,7 +403,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
},
#if P_HISUIAN_FORMS
[SPECIES_TYPHLOSION_HISUIAN] =
[SPECIES_TYPHLOSION_HISUI] =
{
.baseHP = 73,
.baseAttack = 84,
@ -3002,7 +3002,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
},
#if P_PALDEAN_FORMS
[SPECIES_WOOPER_PALDEAN] =
[SPECIES_WOOPER_PALDEA] =
{
.baseHP = 55,
.baseAttack = 45,
@ -3462,34 +3462,34 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.formSpeciesIdTable = sUnownFormSpeciesIdTable, \
}
[SPECIES_UNOWN] = UNOWN_MISC_INFO(A, FALSE, 24, 40, 24, 48, 8 ),
[SPECIES_UNOWN_B] = UNOWN_MISC_INFO(B, TRUE, 24, 32, 40, 48, 9 ),
[SPECIES_UNOWN_C] = UNOWN_MISC_INFO(C, TRUE, 32, 32, 48, 56, 6 ),
[SPECIES_UNOWN_D] = UNOWN_MISC_INFO(D, TRUE, 32, 32, 40, 48, 8 ),
[SPECIES_UNOWN_E] = UNOWN_MISC_INFO(E, TRUE, 32, 32, 40, 48, 10 ),
[SPECIES_UNOWN_F] = UNOWN_MISC_INFO(F, TRUE, 32, 32, 48, 48, 10 ),
[SPECIES_UNOWN_G] = UNOWN_MISC_INFO(G, TRUE, 24, 40, 40, 56, 5 ),
[SPECIES_UNOWN_H] = UNOWN_MISC_INFO(H, TRUE, 32, 32, 48, 48, 8 ),
[SPECIES_UNOWN_I] = UNOWN_MISC_INFO(I, FALSE, 24, 32, 24, 56, 7 ),
[SPECIES_UNOWN_J] = UNOWN_MISC_INFO(J, TRUE, 24, 32, 32, 48, 9 ),
[SPECIES_UNOWN_K] = UNOWN_MISC_INFO(K, TRUE, 32, 32, 40, 56, 7 ),
[SPECIES_UNOWN_L] = UNOWN_MISC_INFO(L, TRUE, 24, 32, 32, 48, 10 ),
[SPECIES_UNOWN_M] = UNOWN_MISC_INFO(M, FALSE, 32, 32, 48, 40, 13 ),
[SPECIES_UNOWN_N] = UNOWN_MISC_INFO(N, TRUE, 32, 24, 48, 40, 13 ),
[SPECIES_UNOWN_O] = UNOWN_MISC_INFO(O, FALSE, 32, 32, 48, 48, 8 ),
[SPECIES_UNOWN_P] = UNOWN_MISC_INFO(P, TRUE, 24, 32, 32, 48, 10 ),
[SPECIES_UNOWN_Q] = UNOWN_MISC_INFO(Q, TRUE, 32, 24, 40, 40, 15 ),
[SPECIES_UNOWN_R] = UNOWN_MISC_INFO(R, TRUE, 24, 32, 32, 40, 12 ),
[SPECIES_UNOWN_S] = UNOWN_MISC_INFO(S, TRUE, 32, 40, 40, 56, 4 ),
[SPECIES_UNOWN_T] = UNOWN_MISC_INFO(T, FALSE, 24, 32, 32, 40, 13 ),
[SPECIES_UNOWN_U] = UNOWN_MISC_INFO(U, FALSE, 32, 32, 48, 40, 13 ),
[SPECIES_UNOWN_V] = UNOWN_MISC_INFO(V, TRUE, 32, 32, 40, 48, 11 ),
[SPECIES_UNOWN_W] = UNOWN_MISC_INFO(W, FALSE, 32, 32, 40, 40, 13 ),
[SPECIES_UNOWN_X] = UNOWN_MISC_INFO(X, FALSE, 24, 24, 40, 40, 15 ),
[SPECIES_UNOWN_Y] = UNOWN_MISC_INFO(Y, FALSE, 24, 32, 32, 48, 10 ),
[SPECIES_UNOWN_Z] = UNOWN_MISC_INFO(Z, TRUE, 24, 32, 32, 48, 10 ),
[SPECIES_UNOWN_EMARK] = UNOWN_MISC_INFO(ExclamationMark, FALSE, 24, 40, 24, 56, 6 ),
[SPECIES_UNOWN_QMARK] = UNOWN_MISC_INFO(QuestionMark, TRUE, 24, 40, 32, 56, 6 ),
[SPECIES_UNOWN] = UNOWN_MISC_INFO(A, FALSE, 24, 40, 24, 48, 8 ),
[SPECIES_UNOWN_B] = UNOWN_MISC_INFO(B, TRUE, 24, 32, 40, 48, 9 ),
[SPECIES_UNOWN_C] = UNOWN_MISC_INFO(C, TRUE, 32, 32, 48, 56, 6 ),
[SPECIES_UNOWN_D] = UNOWN_MISC_INFO(D, TRUE, 32, 32, 40, 48, 8 ),
[SPECIES_UNOWN_E] = UNOWN_MISC_INFO(E, TRUE, 32, 32, 40, 48, 10 ),
[SPECIES_UNOWN_F] = UNOWN_MISC_INFO(F, TRUE, 32, 32, 48, 48, 10 ),
[SPECIES_UNOWN_G] = UNOWN_MISC_INFO(G, TRUE, 24, 40, 40, 56, 5 ),
[SPECIES_UNOWN_H] = UNOWN_MISC_INFO(H, TRUE, 32, 32, 48, 48, 8 ),
[SPECIES_UNOWN_I] = UNOWN_MISC_INFO(I, FALSE, 24, 32, 24, 56, 7 ),
[SPECIES_UNOWN_J] = UNOWN_MISC_INFO(J, TRUE, 24, 32, 32, 48, 9 ),
[SPECIES_UNOWN_K] = UNOWN_MISC_INFO(K, TRUE, 32, 32, 40, 56, 7 ),
[SPECIES_UNOWN_L] = UNOWN_MISC_INFO(L, TRUE, 24, 32, 32, 48, 10 ),
[SPECIES_UNOWN_M] = UNOWN_MISC_INFO(M, FALSE, 32, 32, 48, 40, 13 ),
[SPECIES_UNOWN_N] = UNOWN_MISC_INFO(N, TRUE, 32, 24, 48, 40, 13 ),
[SPECIES_UNOWN_O] = UNOWN_MISC_INFO(O, FALSE, 32, 32, 48, 48, 8 ),
[SPECIES_UNOWN_P] = UNOWN_MISC_INFO(P, TRUE, 24, 32, 32, 48, 10 ),
[SPECIES_UNOWN_Q] = UNOWN_MISC_INFO(Q, TRUE, 32, 24, 40, 40, 15 ),
[SPECIES_UNOWN_R] = UNOWN_MISC_INFO(R, TRUE, 24, 32, 32, 40, 12 ),
[SPECIES_UNOWN_S] = UNOWN_MISC_INFO(S, TRUE, 32, 40, 40, 56, 4 ),
[SPECIES_UNOWN_T] = UNOWN_MISC_INFO(T, FALSE, 24, 32, 32, 40, 13 ),
[SPECIES_UNOWN_U] = UNOWN_MISC_INFO(U, FALSE, 32, 32, 48, 40, 13 ),
[SPECIES_UNOWN_V] = UNOWN_MISC_INFO(V, TRUE, 32, 32, 40, 48, 11 ),
[SPECIES_UNOWN_W] = UNOWN_MISC_INFO(W, FALSE, 32, 32, 40, 40, 13 ),
[SPECIES_UNOWN_X] = UNOWN_MISC_INFO(X, FALSE, 24, 24, 40, 40, 15 ),
[SPECIES_UNOWN_Y] = UNOWN_MISC_INFO(Y, FALSE, 24, 32, 32, 48, 10 ),
[SPECIES_UNOWN_Z] = UNOWN_MISC_INFO(Z, TRUE, 24, 32, 32, 48, 10 ),
[SPECIES_UNOWN_EXCLAMATION] = UNOWN_MISC_INFO(ExclamationMark, FALSE, 24, 40, 24, 56, 6 ),
[SPECIES_UNOWN_QUESTION] = UNOWN_MISC_INFO(QuestionMark, TRUE, 24, 40, 32, 56, 6 ),
#endif //P_FAMILY_UNOWN
#if P_FAMILY_WOBBUFFET
@ -4436,7 +4436,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
},
#if P_HISUIAN_FORMS
[SPECIES_QWILFISH_HISUIAN] =
[SPECIES_QWILFISH_HISUI] =
{
.baseHP = 65,
.baseAttack = 95,
@ -4907,7 +4907,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
#endif //P_GEN_4_CROSS_EVOS
#if P_HISUIAN_FORMS
[SPECIES_SNEASEL_HISUIAN] =
[SPECIES_SNEASEL_HISUI] =
{
.baseHP = 55,
.baseAttack = 95,
@ -5721,7 +5721,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
},
#if P_GALARIAN_FORMS
[SPECIES_CORSOLA_GALARIAN] =
[SPECIES_CORSOLA_GALAR] =
{
.baseHP = CORSOLA_HP - 5,
.baseAttack = 55,

6
src/data/pokemon/species_info/gen_3_families.h
View File

@ -1064,7 +1064,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
},
#if P_GALARIAN_FORMS
[SPECIES_ZIGZAGOON_GALARIAN] =
[SPECIES_ZIGZAGOON_GALAR] =
{
.baseHP = 38,
.baseAttack = 30,
@ -1126,10 +1126,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.teachableLearnset = sZigzagoonGalarianTeachableLearnset,
.eggMoveLearnset = sZigzagoonGalarianEggMoveLearnset,
.formSpeciesIdTable = sZigzagoonFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}),
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE_GALAR}),
},
[SPECIES_LINOONE_GALARIAN] =
[SPECIES_LINOONE_GALAR] =
{
.baseHP = 78,
.baseAttack = 70,

42
src/data/pokemon/species_info/gen_4_families.h
View File

@ -1542,7 +1542,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
#endif //P_FAMILY_SHIELDON
#if P_FAMILY_BURMY
[SPECIES_BURMY_PLANT_CLOAK] =
[SPECIES_BURMY_PLANT] =
{
.baseHP = 40,
.baseAttack = 29,
@ -1605,11 +1605,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.teachableLearnset = sBurmyTeachableLearnset,
.formSpeciesIdTable = sBurmyFormSpeciesIdTable,
.formChangeTable = sBurmyFormChangeTable,
.evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_PLANT_CLOAK},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM_PLANT_CLOAK}),
.evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_PLANT},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM_PLANT}),
},
[SPECIES_BURMY_SANDY_CLOAK] =
[SPECIES_BURMY_SANDY] =
{
.baseHP = 40,
.baseAttack = 29,
@ -1672,11 +1672,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.teachableLearnset = sBurmyTeachableLearnset,
.formSpeciesIdTable = sBurmyFormSpeciesIdTable,
.formChangeTable = sBurmyFormChangeTable,
.evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM_SANDY_CLOAK}),
.evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM_SANDY}),
},
[SPECIES_BURMY_TRASH_CLOAK] =
[SPECIES_BURMY_TRASH] =
{
.baseHP = 40,
.baseAttack = 29,
@ -1739,11 +1739,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.teachableLearnset = sBurmyTeachableLearnset,
.formSpeciesIdTable = sBurmyFormSpeciesIdTable,
.formChangeTable = sBurmyFormChangeTable,
.evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM_TRASH_CLOAK}),
.evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM_TRASH}),
},
[SPECIES_WORMADAM_PLANT_CLOAK] =
[SPECIES_WORMADAM_PLANT] =
{
.baseHP = 60,
.baseAttack = 59,
@ -1807,7 +1807,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.formSpeciesIdTable = sWormadamFormSpeciesIdTable,
},
[SPECIES_WORMADAM_SANDY_CLOAK] =
[SPECIES_WORMADAM_SANDY] =
{
.baseHP = 60,
.baseAttack = 79,
@ -1871,7 +1871,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.formSpeciesIdTable = sWormadamFormSpeciesIdTable,
},
[SPECIES_WORMADAM_TRASH_CLOAK] =
[SPECIES_WORMADAM_TRASH] =
{
.baseHP = 60,
.baseAttack = 69,
@ -1997,9 +1997,9 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.formSpeciesIdTable = sMothimFormSpeciesIdTable, \
}
[SPECIES_MOTHIM_PLANT_CLOAK] = MOTHIM_SPECIES_INFO,
[SPECIES_MOTHIM_SANDY_CLOAK] = MOTHIM_SPECIES_INFO,
[SPECIES_MOTHIM_TRASH_CLOAK] = MOTHIM_SPECIES_INFO,
[SPECIES_MOTHIM_PLANT] = MOTHIM_SPECIES_INFO,
[SPECIES_MOTHIM_SANDY] = MOTHIM_SPECIES_INFO,
[SPECIES_MOTHIM_TRASH] = MOTHIM_SPECIES_INFO,
#endif //P_FAMILY_BURMY
#if P_FAMILY_COMBEE
@ -2518,7 +2518,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
#endif //P_FAMILY_CHERUBI
#if P_FAMILY_SHELLOS
[SPECIES_SHELLOS_WEST_SEA] =
[SPECIES_SHELLOS_WEST] =
{
.baseHP = 76,
.baseAttack = 48,
@ -2579,10 +2579,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.teachableLearnset = sShellosTeachableLearnset,
.eggMoveLearnset = sShellosEggMoveLearnset,
.formSpeciesIdTable = sShellosFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_WEST_SEA}),
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_WEST}),
},
[SPECIES_SHELLOS_EAST_SEA] =
[SPECIES_SHELLOS_EAST] =
{
.baseHP = 76,
.baseAttack = 48,
@ -2643,10 +2643,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.teachableLearnset = sShellosTeachableLearnset,
.eggMoveLearnset = sShellosEggMoveLearnset,
.formSpeciesIdTable = sShellosFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_EAST_SEA}),
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_EAST}),
},
[SPECIES_GASTRODON_WEST_SEA] =
[SPECIES_GASTRODON_WEST] =
{
.baseHP = 111,
.baseAttack = 83,
@ -2708,7 +2708,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.formSpeciesIdTable = sGastrodonFormSpeciesIdTable,
},
[SPECIES_GASTRODON_EAST_SEA] =
[SPECIES_GASTRODON_EAST] =
{
.baseHP = 111,
.baseAttack = 83,

54
src/data/pokemon/species_info/gen_5_families.h
View File

@ -570,7 +570,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.levelUpLearnset = sDewottLevelUpLearnset,
.teachableLearnset = sDewottTeachableLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SAMUROTT},
{EVO_NONE, 0, SPECIES_SAMUROTT_HISUIAN}),
{EVO_NONE, 0, SPECIES_SAMUROTT_HISUI}),
},
[SPECIES_SAMUROTT] =
@ -636,7 +636,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
},
#if P_HISUIAN_FORMS
[SPECIES_SAMUROTT_HISUIAN] =
[SPECIES_SAMUROTT_HISUI] =
{
.baseHP = 90,
.baseAttack = 108,
@ -3698,7 +3698,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.teachableLearnset = sPetililTeachableLearnset,
.eggMoveLearnset = sPetililEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_LILLIGANT},
{EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}),
{EVO_NONE, 0, SPECIES_LILLIGANT_HISUI}),
},
[SPECIES_LILLIGANT] =
@ -3766,7 +3766,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
},
#if P_HISUIAN_FORMS
[SPECIES_LILLIGANT_HISUIAN] =
[SPECIES_LILLIGANT_HISUI] =
{
.baseHP = 70,
.baseAttack = 105,
@ -4028,11 +4028,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.levelUpLearnset = sBasculinWhiteStripedLevelUpLearnset,
.teachableLearnset = sBasculinWhiteStripedTeachableLearnset,
.formSpeciesIdTable = sBasculinFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_RECOIL_DAMAGE_MALE, 294, SPECIES_BASCULEGION_MALE},
{EVO_RECOIL_DAMAGE_FEMALE, 294, SPECIES_BASCULEGION_FEMALE}),
.evolutions = EVOLUTION({EVO_RECOIL_DAMAGE_MALE, 294, SPECIES_BASCULEGION_M},
{EVO_RECOIL_DAMAGE_FEMALE, 294, SPECIES_BASCULEGION_F}),
},
[SPECIES_BASCULEGION_MALE] =
[SPECIES_BASCULEGION_M] =
{
.baseHP = 120,
.baseAttack = 112,
@ -4095,7 +4095,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.formSpeciesIdTable = sBasculegionFormSpeciesIdTable,
},
[SPECIES_BASCULEGION_FEMALE] =
[SPECIES_BASCULEGION_F] =
{
.baseHP = 120,
.baseAttack = 92,
@ -4418,10 +4418,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.teachableLearnset = sDarumakaTeachableLearnset,
.eggMoveLearnset = sDarumakaEggMoveLearnset,
.formSpeciesIdTable = sDarumakaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}),
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD}),
},
[SPECIES_DARMANITAN_STANDARD_MODE] =
[SPECIES_DARMANITAN_STANDARD] =
{
.baseHP = 105,
.baseAttack = 140,
@ -4484,7 +4484,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.formChangeTable = sDarmanitanFormChangeTable,
},
[SPECIES_DARMANITAN_ZEN_MODE] =
[SPECIES_DARMANITAN_ZEN] =
{
.baseHP = 105,
.baseAttack = 30,
@ -4539,7 +4539,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
},
#if P_GALARIAN_FORMS
[SPECIES_DARUMAKA_GALARIAN] =
[SPECIES_DARUMAKA_GALAR] =
{
.baseHP = 70,
.baseAttack = 90,
@ -4601,10 +4601,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.teachableLearnset = sDarumakaGalarianTeachableLearnset,
.eggMoveLearnset = sDarumakaGalarianEggMoveLearnset,
.formSpeciesIdTable = sDarumakaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALAR_STANDARD}),
},
[SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] =
[SPECIES_DARMANITAN_GALAR_STANDARD] =
{
.baseHP = 105,
.baseAttack = 140,
@ -4668,7 +4668,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.formChangeTable = sDarmanitanGalarianFormChangeTable,
},
[SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] =
[SPECIES_DARMANITAN_GALAR_ZEN] =
{
.baseHP = 105,
.baseAttack = 160,
@ -5243,7 +5243,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
},
#if P_GALARIAN_FORMS
[SPECIES_YAMASK_GALARIAN] =
[SPECIES_YAMASK_GALAR] =
{
.baseHP = 38,
.baseAttack = 55,
@ -5757,7 +5757,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_GARBODOR_GIGANTAMAX] =
[SPECIES_GARBODOR_GMAX] =
{
.baseHP = 80,
.baseAttack = 95,
@ -5946,7 +5946,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
},
#if P_HISUIAN_FORMS
[SPECIES_ZORUA_HISUIAN] =
[SPECIES_ZORUA_HISUI] =
{
.baseHP = 35,
.baseAttack = 60,
@ -6007,10 +6007,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.levelUpLearnset = sZoruaHisuianLevelUpLearnset,
.teachableLearnset = sZoruaHisuianTeachableLearnset,
.formSpeciesIdTable = sZoruaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK_HISUIAN}),
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK_HISUI}),
},
[SPECIES_ZOROARK_HISUIAN] =
[SPECIES_ZOROARK_HISUI] =
{
.baseHP = 55,
.baseAttack = 100,
@ -9509,7 +9509,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
},
#if P_GALARIAN_FORMS
[SPECIES_STUNFISK_GALARIAN] =
[SPECIES_STUNFISK_GALAR] =
{
.baseHP = 109,
.baseAttack = 81,
@ -10211,7 +10211,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.levelUpLearnset = sRuffletLevelUpLearnset,
.teachableLearnset = sRuffletTeachableLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_BRAVIARY},
{EVO_NONE, 0, SPECIES_BRAVIARY_HISUIAN}),
{EVO_NONE, 0, SPECIES_BRAVIARY_HISUI}),
},
[SPECIES_BRAVIARY] =
@ -10278,7 +10278,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
},
#if P_HISUIAN_FORMS
[SPECIES_BRAVIARY_HISUIAN] =
[SPECIES_BRAVIARY_HISUI] =
{
.baseHP = 110,
.baseAttack = 83,
@ -12198,10 +12198,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
}
[SPECIES_GENESECT] = GENESECT_SPECIES_INFO(Genesect),
[SPECIES_GENESECT_DOUSE_DRIVE] = GENESECT_SPECIES_INFO(GenesectDouseDrive),
[SPECIES_GENESECT_SHOCK_DRIVE] = GENESECT_SPECIES_INFO(GenesectShockDrive),
[SPECIES_GENESECT_BURN_DRIVE] = GENESECT_SPECIES_INFO(GenesectBurnDrive),
[SPECIES_GENESECT_CHILL_DRIVE] = GENESECT_SPECIES_INFO(GenesectChillDrive),
[SPECIES_GENESECT_DOUSE] = GENESECT_SPECIES_INFO(GenesectDouseDrive),
[SPECIES_GENESECT_SHOCK] = GENESECT_SPECIES_INFO(GenesectShockDrive),
[SPECIES_GENESECT_BURN] = GENESECT_SPECIES_INFO(GenesectBurnDrive),
[SPECIES_GENESECT_CHILL] = GENESECT_SPECIES_INFO(GenesectChillDrive),
#endif //P_FAMILY_GENESECT
#ifdef __INTELLISENSE__

68
src/data/pokemon/species_info/gen_6_families.h
View File

@ -1078,7 +1078,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
[SPECIES_SCATTERBUG_OCEAN] = SCATTERBUG_SPECIES_INFO(OCEAN),
[SPECIES_SCATTERBUG_JUNGLE] = SCATTERBUG_SPECIES_INFO(JUNGLE),
[SPECIES_SCATTERBUG_FANCY] = SCATTERBUG_SPECIES_INFO(FANCY),
[SPECIES_SCATTERBUG_POKE_BALL] = SCATTERBUG_SPECIES_INFO(POKE_BALL),
[SPECIES_SCATTERBUG_POKEBALL] = SCATTERBUG_SPECIES_INFO(POKEBALL),
#define SPEWPA_SPECIES_INFO(evolution) \
{ \
@ -1159,7 +1159,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
[SPECIES_SPEWPA_OCEAN] = SPEWPA_SPECIES_INFO(OCEAN),
[SPECIES_SPEWPA_JUNGLE] = SPEWPA_SPECIES_INFO(JUNGLE),
[SPECIES_SPEWPA_FANCY] = SPEWPA_SPECIES_INFO(FANCY),
[SPECIES_SPEWPA_POKE_BALL] = SPEWPA_SPECIES_INFO(POKE_BALL),
[SPECIES_SPEWPA_POKEBALL] = SPEWPA_SPECIES_INFO(POKEBALL),
#define VIVILLON_MISC_INFO(form, color, iconPal) \
.baseHP = 80, \
@ -1390,7 +1390,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from a mysterious land.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_POKE_BALL] =
[SPECIES_VIVILLON_POKEBALL] =
{
VIVILLON_MISC_INFO(PokeBall, BODY_COLOR_RED, 2),
.description = COMPOUND_STRING(
@ -1590,9 +1590,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.teachableLearnset = sFlabebeTeachableLearnset, \
.eggMoveLearnset = sFlabebeEggMoveLearnset, \
.formSpeciesIdTable = sFlabebeFormSpeciesIdTable, \
.evolutions = EVOLUTION({EVO_LEVEL, 19, SPECIES_FLOETTE_ ##FORM##_FLOWER})
.evolutions = EVOLUTION({EVO_LEVEL, 19, SPECIES_FLOETTE_ ##FORM})
[SPECIES_FLABEBE_RED_FLOWER] =
[SPECIES_FLABEBE_RED] =
{
FLABEBE_MISC_INFO(Red, RED, 1),
.description = COMPOUND_STRING(
@ -1601,7 +1601,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"begins flying around in search of a\n"
"flower it likes."),
},
[SPECIES_FLABEBE_YELLOW_FLOWER] =
[SPECIES_FLABEBE_YELLOW] =
{
FLABEBE_MISC_INFO(Yellow, YELLOW, 1),
.description = COMPOUND_STRING(
@ -1610,7 +1610,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"within flowers. This Pokémon is\n"
"particularly fond of yellow flowers."),
},
[SPECIES_FLABEBE_ORANGE_FLOWER] =
[SPECIES_FLABEBE_ORANGE] =
{
FLABEBE_MISC_INFO(Orange, ORANGE, 0),
.description = COMPOUND_STRING(
@ -1619,7 +1619,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"return. This Pokémon likes orange\n"
"flowers best of all."),
},
[SPECIES_FLABEBE_BLUE_FLOWER] =
[SPECIES_FLABEBE_BLUE] =
{
FLABEBE_MISC_INFO(Blue, BLUE, 0),
.description = COMPOUND_STRING(
@ -1628,7 +1628,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"power emanating from its flower\n"
"and bobs along lightly through the air."),
},
[SPECIES_FLABEBE_WHITE_FLOWER] =
[SPECIES_FLABEBE_WHITE] =
{
FLABEBE_MISC_INFO(White, WHITE, 1),
.description = COMPOUND_STRING(
@ -1695,10 +1695,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.backPicYOffset = 2, \
.levelUpLearnset = sFloetteLevelUpLearnset, \
.teachableLearnset = sFloetteTeachableLearnset, \
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_ ##FORM##_FLOWER}),\
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_ ##FORM}),\
FLOETTE_MISC_INFO(form, FORM, iconPal)
[SPECIES_FLOETTE_RED_FLOWER] =
[SPECIES_FLOETTE_RED] =
{
FLOETTE_NORMAL_INFO(Red, RED, 1),
.description = COMPOUND_STRING(
@ -1707,7 +1707,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"into flowers and draw forth their\n"
"latent potential."),
},
[SPECIES_FLOETTE_YELLOW_FLOWER] =
[SPECIES_FLOETTE_YELLOW] =
{
FLOETTE_NORMAL_INFO(Yellow, YELLOW, 1),
.description = COMPOUND_STRING(
@ -1716,7 +1716,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This power then becomes the moves\n"
"Floette uses to protect itself."),
},
[SPECIES_FLOETTE_ORANGE_FLOWER] =
[SPECIES_FLOETTE_ORANGE] =
{
FLOETTE_NORMAL_INFO(Orange, ORANGE, 0),
.description = COMPOUND_STRING(
@ -1725,7 +1725,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"flowers, compared to flowers of other\n"
"colors."),
},
[SPECIES_FLOETTE_BLUE_FLOWER] =
[SPECIES_FLOETTE_BLUE] =
{
FLOETTE_NORMAL_INFO(Blue, BLUE, 0),
.description = COMPOUND_STRING(
@ -1734,7 +1734,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"will bring them back to its territory\n"
"and care for them."),
},
[SPECIES_FLOETTE_WHITE_FLOWER] =
[SPECIES_FLOETTE_WHITE] =
{
FLOETTE_NORMAL_INFO(White, WHITE, 1),
.description = COMPOUND_STRING(
@ -1743,7 +1743,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"without mercy. This Floette takes\n"
"particularly good care of white flowers."),
},
[SPECIES_FLOETTE_ETERNAL_FLOWER] =
[SPECIES_FLOETTE_ETERNAL] =
{
FLOETTE_MISC_INFO(Eternal, ETERNAL, 0),
.baseHP = 74,
@ -1754,7 +1754,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.baseSpDefense = 128,
.expYield = 243,
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
.cryId = CRY_FLOETTE_ETERNAL_FLOWER,
.cryId = CRY_FLOETTE_ETERNAL,
.description = COMPOUND_STRING(
"The flower it's holding can no\n"
"longer be found blooming anywhere. It's\n"
@ -1826,7 +1826,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.teachableLearnset = sFlorgesTeachableLearnset, \
.formSpeciesIdTable = sFlorgesFormSpeciesIdTable
[SPECIES_FLORGES_RED_FLOWER] =
[SPECIES_FLORGES_RED] =
{
FLORGES_MISC_INFO(Red, 0),
.description = COMPOUND_STRING(
@ -1835,7 +1835,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"draws forth the power of the red\n"
"flowers around its neck."),
},
[SPECIES_FLORGES_YELLOW_FLOWER] =
[SPECIES_FLORGES_YELLOW] =
{
FLORGES_MISC_INFO(Yellow, 1),
.description = COMPOUND_STRING(
@ -1844,7 +1844,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"ruthlessly punishes anyone who\n"
"tramples on flowering plants."),
},
[SPECIES_FLORGES_ORANGE_FLOWER] =
[SPECIES_FLORGES_ORANGE] =
{
FLORGES_MISC_INFO(Orange, 0),
.description = COMPOUND_STRING(
@ -1853,7 +1853,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"care for their castles' exquisite\n"
"gardens."),
},
[SPECIES_FLORGES_BLUE_FLOWER] =
[SPECIES_FLORGES_BLUE] =
{
FLORGES_MISC_INFO(Blue, 0),
.description = COMPOUND_STRING(
@ -1861,7 +1861,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"expensive in the past, so paintings\n"
"of blue Florges are highly valuable."),
},
[SPECIES_FLORGES_WHITE_FLOWER] =
[SPECIES_FLORGES_WHITE] =
{
FLORGES_MISC_INFO(White, 0),
.description = COMPOUND_STRING(
@ -2261,11 +2261,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.levelUpLearnset = sEspurrLevelUpLearnset,
.teachableLearnset = sEspurrTeachableLearnset,
.eggMoveLearnset = sEspurrEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_MALE},
{EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}),
.evolutions = EVOLUTION({EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_M},
{EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_F}),
},
[SPECIES_MEOWSTIC_MALE] =
[SPECIES_MEOWSTIC_M] =
{
.baseHP = 74,
.baseAttack = 48,
@ -2327,7 +2327,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.formSpeciesIdTable = sMeowsticFormSpeciesIdTable,
},
[SPECIES_MEOWSTIC_FEMALE] =
[SPECIES_MEOWSTIC_F] =
{
.baseHP = 74,
.baseAttack = 48,
@ -4051,7 +4051,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.teachableLearnset = sGoomyTeachableLearnset,
.eggMoveLearnset = sGoomyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_SLIGGOO},
{EVO_NONE, 0, SPECIES_SLIGGOO_HISUIAN}),
{EVO_NONE, 0, SPECIES_SLIGGOO_HISUI}),
},
[SPECIES_SLIGGOO] =
@ -4182,7 +4182,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
},
#if P_HISUIAN_FORMS
[SPECIES_SLIGGOO_HISUIAN] =
[SPECIES_SLIGGOO_HISUI] =
{
.baseHP = 58,
.baseAttack = 75,
@ -4244,11 +4244,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.levelUpLearnset = sSliggooHisuianLevelUpLearnset,
.teachableLearnset = sSliggooHisuianTeachableLearnset,
.formSpeciesIdTable = sSliggooFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL_RAIN, 50, SPECIES_GOODRA_HISUIAN},
{EVO_LEVEL_FOG, 50, SPECIES_GOODRA_HISUIAN}),
.evolutions = EVOLUTION({EVO_LEVEL_RAIN, 50, SPECIES_GOODRA_HISUI},
{EVO_LEVEL_FOG, 50, SPECIES_GOODRA_HISUI}),
},
[SPECIES_GOODRA_HISUIAN] =
[SPECIES_GOODRA_HISUI] =
{
.baseHP = 80,
.baseAttack = 100,
@ -5086,7 +5086,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.teachableLearnset = sBergmiteTeachableLearnset,
.eggMoveLearnset = sBergmiteEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_AVALUGG},
{EVO_NONE, 0, SPECIES_AVALUGG_HISUIAN}),
{EVO_NONE, 0, SPECIES_AVALUGG_HISUI}),
},
[SPECIES_AVALUGG] =
@ -5152,7 +5152,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
},
#if P_HISUIAN_FORMS
[SPECIES_AVALUGG_HISUIAN] =
[SPECIES_AVALUGG_HISUI] =
{
.baseHP = 95,
.baseAttack = 127,
@ -5545,7 +5545,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
#endif //P_FAMILY_YVELTAL
#if P_FAMILY_ZYGARDE
[SPECIES_ZYGARDE_50_AURA_BREAK] =
[SPECIES_ZYGARDE_50] =
{
.baseHP = 108,
.baseAttack = 100,

10
src/data/pokemon/species_info/gen_7_families.h
View File

@ -128,7 +128,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.levelUpLearnset = sDartrixLevelUpLearnset,
.teachableLearnset = sDartrixTeachableLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DECIDUEYE},
{EVO_NONE, 0, SPECIES_DECIDUEYE_HISUIAN}),
{EVO_NONE, 0, SPECIES_DECIDUEYE_HISUI}),
},
[SPECIES_DECIDUEYE] =
@ -194,7 +194,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
},
#if P_HISUIAN_FORMS
[SPECIES_DECIDUEYE_HISUIAN] =
[SPECIES_DECIDUEYE_HISUI] =
{
.baseHP = 88,
.baseAttack = 112,
@ -4745,7 +4745,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.formChangeTable = sMimikyuTotemFormChangeTable,
},
[SPECIES_MIMIKYU_TOTEM_BUSTED] =
[SPECIES_MIMIKYU_BUSTED_TOTEM] =
{
.baseHP = 55,
.baseAttack = 90,
@ -6577,7 +6577,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.teachableLearnset = sMagearnaTeachableLearnset,
.formSpeciesIdTable = sMagearnaFormSpeciesIdTable,
},
[SPECIES_MAGEARNA_ORIGINAL_COLOR] =
[SPECIES_MAGEARNA_ORIGINAL] =
{
.baseHP = 80,
.baseAttack = 95,
@ -7165,7 +7165,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_MELMETAL_GIGANTAMAX] =
[SPECIES_MELMETAL_GMAX] =
{
.baseHP = 135,
.baseAttack = 143,

82
src/data/pokemon/species_info/gen_8_families.h
View File

@ -191,7 +191,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_RILLABOOM_GIGANTAMAX] =
[SPECIES_RILLABOOM_GMAX] =
{
.baseHP = 100,
.baseAttack = 125,
@ -437,7 +437,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_CINDERACE_GIGANTAMAX] =
[SPECIES_CINDERACE_GMAX] =
{
.baseHP = 80,
.baseAttack = 116,
@ -685,7 +685,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_INTELEON_GIGANTAMAX] =
[SPECIES_INTELEON_GMAX] =
{
.baseHP = 70,
.baseAttack = 85,
@ -1061,7 +1061,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_CORVIKNIGHT_GIGANTAMAX] =
[SPECIES_CORVIKNIGHT_GMAX] =
{
.baseHP = 98,
.baseAttack = 87,
@ -1312,7 +1312,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_ORBEETLE_GIGANTAMAX] =
[SPECIES_ORBEETLE_GMAX] =
{
.baseHP = 60,
.baseAttack = 45,
@ -1875,7 +1875,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_DREDNAW_GIGANTAMAX] =
[SPECIES_DREDNAW_GMAX] =
{
.baseHP = 90,
.baseAttack = 115,
@ -2248,7 +2248,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_COALOSSAL_GIGANTAMAX] =
[SPECIES_COALOSSAL_GMAX] =
{
.baseHP = 110,
.baseAttack = 80,
@ -2437,7 +2437,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_FLAPPLE_GIGANTAMAX] =
[SPECIES_FLAPPLE_GMAX] =
{
.baseHP = 70,
.baseAttack = 110,
@ -2557,7 +2557,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_APPLETUN_GIGANTAMAX] =
[SPECIES_APPLETUN_GMAX] =
{
.baseHP = 110,
.baseAttack = 85,
@ -2866,7 +2866,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_SANDACONDA_GIGANTAMAX] =
[SPECIES_SANDACONDA_GMAX] =
{
.baseHP = 72,
.baseAttack = 107,
@ -3356,7 +3356,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] =
[SPECIES_TOXTRICITY_AMPED_GMAX] =
{
.baseHP = 75,
.baseAttack = 98,
@ -3472,7 +3472,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] =
[SPECIES_TOXTRICITY_LOW_KEY_GMAX] =
{
.baseHP = 75,
.baseAttack = 98,
@ -3653,7 +3653,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_CENTISKORCH_GIGANTAMAX] =
[SPECIES_CENTISKORCH_GMAX] =
{
.baseHP = 100,
.baseAttack = 115,
@ -4278,7 +4278,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_HATTERENE_GIGANTAMAX] =
[SPECIES_HATTERENE_GMAX] =
{
.baseHP = 57,
.baseAttack = 90,
@ -4525,7 +4525,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_GRIMMSNARL_GIGANTAMAX] =
[SPECIES_GRIMMSNARL_GMAX] =
{
.baseHP = 95,
.baseAttack = 120,
@ -4781,7 +4781,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
[SPECIES_ALCREMIE_RIBBON_CARAMEL_SWIRL] = ALCREMIE_REGULAR_SPECIES_INFO(Ribbon, CaramelSwirl, BODY_COLOR_BROWN),
[SPECIES_ALCREMIE_RIBBON_RAINBOW_SWIRL] = ALCREMIE_REGULAR_SPECIES_INFO(Ribbon, RainbowSwirl, BODY_COLOR_YELLOW),
#if P_GIGANTAMAX_FORMS
[SPECIES_ALCREMIE_GIGANTAMAX] =
[SPECIES_ALCREMIE_GMAX] =
{
ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW),
.speciesName = _("Alcremie"),
@ -5141,7 +5141,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
#endif //P_FAMILY_STONJOURNER
#if P_FAMILY_EISCUE
[SPECIES_EISCUE_ICE_FACE] =
[SPECIES_EISCUE_ICE] =
{
.baseHP = 75,
.baseAttack = 80,
@ -5161,7 +5161,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.abilities = { ABILITY_ICE_FACE, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_BLUE,
.speciesName = _("Eiscue"),
.cryId = CRY_EISCUE_ICE_FACE,
.cryId = CRY_EISCUE_ICE,
.natDexNum = NATIONAL_DEX_EISCUE,
.categoryName = _("Penguin"),
.height = 14,
@ -5205,7 +5205,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.formChangeTable = sEiscueFormChangeTable,
},
[SPECIES_EISCUE_NOICE_FACE] =
[SPECIES_EISCUE_NOICE] =
{
.baseHP = 75,
.baseAttack = 80,
@ -5263,7 +5263,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
#endif //P_FAMILY_EISCUE
#if P_FAMILY_INDEEDEE
[SPECIES_INDEEDEE_MALE] =
[SPECIES_INDEEDEE_M] =
{
.baseHP = 60,
.baseAttack = 65,
@ -5283,7 +5283,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.abilities = { ABILITY_INNER_FOCUS, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE },
.bodyColor = BODY_COLOR_PURPLE,
.speciesName = _("Indeedee"),
.cryId = CRY_INDEEDEE_MALE,
.cryId = CRY_INDEEDEE_M,
.natDexNum = NATIONAL_DEX_INDEEDEE,
.categoryName = _("Emotion"),
.height = 9,
@ -5325,7 +5325,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.formSpeciesIdTable = sIndeedeeFormSpeciesIdTable,
},
[SPECIES_INDEEDEE_FEMALE] =
[SPECIES_INDEEDEE_F] =
{
.baseHP = 70,
.baseAttack = 55,
@ -5345,7 +5345,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.abilities = { ABILITY_OWN_TEMPO, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE },
.bodyColor = BODY_COLOR_PURPLE,
.speciesName = _("Indeedee"),
.cryId = CRY_INDEEDEE_FEMALE,
.cryId = CRY_INDEEDEE_F,
.natDexNum = NATIONAL_DEX_INDEEDEE,
.categoryName = _("Emotion"),
.height = 9,
@ -5640,7 +5640,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_COPPERAJAH_GIGANTAMAX] =
[SPECIES_COPPERAJAH_GMAX] =
{
.baseHP = 122,
.baseAttack = 130,
@ -6016,7 +6016,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_DURALUDON_GIGANTAMAX] =
[SPECIES_DURALUDON_GMAX] =
{
.baseHP = 70,
.baseAttack = 95,
@ -6329,7 +6329,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
#endif //P_FAMILY_DREEPY
#if P_FAMILY_ZACIAN
[SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] =
[SPECIES_ZACIAN_HERO] =
{
.baseHP = 92,
.baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130,
@ -6349,7 +6349,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_BLUE,
.speciesName = _("Zacian"),
.cryId = CRY_ZACIAN_HERO_OF_MANY_BATTLES,
.cryId = CRY_ZACIAN_HERO,
.natDexNum = NATIONAL_DEX_ZACIAN,
.categoryName = _("Warrior"),
.height = 28,
@ -6394,7 +6394,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.formChangeTable = sZacianFormChangeTable,
},
[SPECIES_ZACIAN_CROWNED_SWORD] =
[SPECIES_ZACIAN_CROWNED] =
{
.baseHP = 92,
.baseAttack = P_UPDATED_STATS >= GEN_9 ? 150 : 170,
@ -6462,7 +6462,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
#endif //P_FAMILY_ZACIAN
#if P_FAMILY_ZAMAZENTA
[SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] =
[SPECIES_ZAMAZENTA_HERO] =
{
.baseHP = 92,
.baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130,
@ -6482,7 +6482,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_RED,
.speciesName = _("Zamazenta"),
.cryId = CRY_ZAMAZENTA_HERO_OF_MANY_BATTLES,
.cryId = CRY_ZAMAZENTA_HERO,
.natDexNum = NATIONAL_DEX_ZAMAZENTA,
.categoryName = _("Warrior"),
.height = 29,
@ -6528,7 +6528,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.formChangeTable = sZamazentaFormChangeTable,
},
[SPECIES_ZAMAZENTA_CROWNED_SHIELD] =
[SPECIES_ZAMAZENTA_CROWNED] =
{
.baseHP = 92,
.baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130,
@ -6782,13 +6782,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.perfectIVCount = LEGENDARY_PERFECT_IV_COUNT,
.levelUpLearnset = sKubfuLevelUpLearnset,
.teachableLearnset = sKubfuTeachableLearnset,
.evolutions = EVOLUTION({EVO_DARK_SCROLL, 0, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE},
{EVO_ITEM, ITEM_SCROLL_OF_DARKNESS, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE},
{EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE},
{EVO_ITEM, ITEM_SCROLL_OF_WATERS, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}),
.evolutions = EVOLUTION({EVO_DARK_SCROLL, 0, SPECIES_URSHIFU_SINGLE_STRIKE},
{EVO_ITEM, ITEM_SCROLL_OF_DARKNESS, SPECIES_URSHIFU_SINGLE_STRIKE},
{EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE},
{EVO_ITEM, ITEM_SCROLL_OF_WATERS, SPECIES_URSHIFU_RAPID_STRIKE}),
},
[SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] =
[SPECIES_URSHIFU_SINGLE_STRIKE] =
{
.baseHP = 100,
.baseAttack = 130,
@ -6854,7 +6854,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] =
[SPECIES_URSHIFU_SINGLE_STRIKE_GMAX] =
{
.baseHP = 100,
.baseAttack = 130,
@ -6912,7 +6912,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#endif //P_GIGANTAMAX_FORMS
[SPECIES_URSHIFU_RAPID_STRIKE_STYLE] =
[SPECIES_URSHIFU_RAPID_STRIKE] =
{
.baseHP = 100,
.baseAttack = 130,
@ -6978,7 +6978,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_GIGANTAMAX_FORMS
[SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] =
[SPECIES_URSHIFU_RAPID_STRIKE_GMAX] =
{
.baseHP = 100,
.baseAttack = 130,
@ -7489,7 +7489,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
},
#if P_FUSION_FORMS
[SPECIES_CALYREX_ICE_RIDER] =
[SPECIES_CALYREX_ICE] =
{
.baseHP = 100,
.baseAttack = 165,
@ -7555,7 +7555,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.formSpeciesIdTable = sCalyrexFormSpeciesIdTable,
},
[SPECIES_CALYREX_SHADOW_RIDER] =
[SPECIES_CALYREX_SHADOW] =
{
.baseHP = 100,
.baseAttack = 85,

44
src/data/pokemon/species_info/gen_9_families.h
View File

@ -628,11 +628,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.levelUpLearnset = sLechonkLevelUpLearnset,
.teachableLearnset = sLechonkTeachableLearnset,
.eggMoveLearnset = sLechonkEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE_MALE},
{EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_FEMALE}),
.evolutions = EVOLUTION({EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE_M},
{EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_F}),
},
[SPECIES_OINKOLOGNE_MALE] =
[SPECIES_OINKOLOGNE_M] =
{
.baseHP = 110,
.baseAttack = 100,
@ -652,7 +652,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.abilities = { ABILITY_LINGERING_AROMA, ABILITY_GLUTTONY, ABILITY_THICK_FAT },
.bodyColor = BODY_COLOR_GRAY,
.speciesName = _("Oinkologne"),
.cryId = CRY_OINKOLOGNE_MALE,
.cryId = CRY_OINKOLOGNE_M,
.natDexNum = NATIONAL_DEX_OINKOLOGNE,
.categoryName = _("Hog"),
.height = 10,
@ -693,7 +693,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.formSpeciesIdTable = sOinkologneFormSpeciesIdTable,
},
[SPECIES_OINKOLOGNE_FEMALE] =
[SPECIES_OINKOLOGNE_F] =
{
.baseHP = 115,
.baseAttack = 90,
@ -713,7 +713,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.abilities = { ABILITY_AROMA_VEIL, ABILITY_GLUTTONY, ABILITY_THICK_FAT },
.bodyColor = BODY_COLOR_GRAY,
.speciesName = _("Oinkologne"),
.cryId = CRY_OINKOLOGNE_FEMALE,
.cryId = CRY_OINKOLOGNE_F,
.natDexNum = NATIONAL_DEX_OINKOLOGNE,
.categoryName = _("Hog"),
.height = 10,
@ -1257,11 +1257,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.levelUpLearnset = sTandemausLevelUpLearnset,
.teachableLearnset = sTandemausTeachableLearnset,
.eggMoveLearnset = sTandemausEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_FAMILY_OF_FOUR, 25, SPECIES_MAUSHOLD_FAMILY_OF_FOUR},
{EVO_LEVEL_FAMILY_OF_THREE, 25, SPECIES_MAUSHOLD_FAMILY_OF_THREE}),
.evolutions = EVOLUTION({EVO_LEVEL_FAMILY_OF_FOUR, 25, SPECIES_MAUSHOLD_FOUR},
{EVO_LEVEL_FAMILY_OF_THREE, 25, SPECIES_MAUSHOLD_THREE}),
},
[SPECIES_MAUSHOLD_FAMILY_OF_THREE] =
[SPECIES_MAUSHOLD_THREE] =
{
.baseHP = 74,
.baseAttack = 75,
@ -1322,7 +1322,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.teachableLearnset = sMausholdTeachableLearnset,
.formSpeciesIdTable = sMausholdFormSpeciesIdTable,
},
[SPECIES_MAUSHOLD_FAMILY_OF_FOUR] =
[SPECIES_MAUSHOLD_FOUR] =
{
.baseHP = 74,
.baseAttack = 75,
@ -1700,7 +1700,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
#endif //P_FAMILY_SMOLIV
#if P_FAMILY_SQUAWKABILLY
[SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] =
[SPECIES_SQUAWKABILLY_GREEN] =
{
.baseHP = 82,
.baseAttack = 96,
@ -1763,7 +1763,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable,
},
[SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] =
[SPECIES_SQUAWKABILLY_BLUE] =
{
.baseHP = 82,
.baseAttack = 96,
@ -1826,7 +1826,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable,
},
[SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] =
[SPECIES_SQUAWKABILLY_YELLOW] =
{
.baseHP = 82,
.baseAttack = 96,
@ -1889,7 +1889,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable,
},
[SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] =
[SPECIES_SQUAWKABILLY_WHITE] =
{
.baseHP = 82,
.baseAttack = 96,
@ -7433,15 +7433,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, \
}
[SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(Teal, Mask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1, FALSE),
[SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(Wellspring, Mask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 0, FALSE),
[SPECIES_OGERPON_HEARTHFLAME_MASK] = OGERPON_SPECIES_INFO(Hearthflame, Mask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 0, FALSE),
[SPECIES_OGERPON_CORNERSTONE_MASK] = OGERPON_SPECIES_INFO(Cornerstone, Mask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 0, FALSE),
[SPECIES_OGERPON_TEAL] = OGERPON_SPECIES_INFO(Teal, Mask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1, FALSE),
[SPECIES_OGERPON_WELLSPRING] = OGERPON_SPECIES_INFO(Wellspring, Mask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 0, FALSE),
[SPECIES_OGERPON_HEARTHFLAME] = OGERPON_SPECIES_INFO(Hearthflame, Mask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 0, FALSE),
[SPECIES_OGERPON_CORNERSTONE] = OGERPON_SPECIES_INFO(Cornerstone, Mask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 0, FALSE),
#if P_TERA_FORMS
[SPECIES_OGERPON_TEAL_MASK_TERA] = OGERPON_SPECIES_INFO(Teal, MaskTera, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL_MASK, BODY_COLOR_GREEN, 1, TRUE),
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = OGERPON_SPECIES_INFO(Wellspring, MaskTera, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING_MASK, BODY_COLOR_BLUE, 0, TRUE),
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = OGERPON_SPECIES_INFO(Hearthflame, MaskTera, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK, BODY_COLOR_RED, 0, TRUE),
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = OGERPON_SPECIES_INFO(Cornerstone, MaskTera, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK, BODY_COLOR_GRAY, 0, TRUE),
[SPECIES_OGERPON_TEAL_TERA] = OGERPON_SPECIES_INFO(Teal, MaskTera, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL_MASK, BODY_COLOR_GREEN, 1, TRUE),
[SPECIES_OGERPON_WELLSPRING_TERA] = OGERPON_SPECIES_INFO(Wellspring, MaskTera, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING_MASK, BODY_COLOR_BLUE, 0, TRUE),
[SPECIES_OGERPON_HEARTHFLAME_TERA] = OGERPON_SPECIES_INFO(Hearthflame, MaskTera, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK, BODY_COLOR_RED, 0, TRUE),
[SPECIES_OGERPON_CORNERSTONE_TERA] = OGERPON_SPECIES_INFO(Cornerstone, MaskTera, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK, BODY_COLOR_GRAY, 0, TRUE),
#endif //P_TERA_FORMS
#endif //P_FAMILY_OGERPON

54
src/pokemon_jump.c
View File

@ -435,38 +435,38 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_WEEDLE, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_KAKUNA, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_RATTATA, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_RATTATA_ALOLAN, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_RATTATA_ALOLA, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_RATICATE, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_RATICATE_ALOLAN, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_RATICATE_ALOLA, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_PIKACHU, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_COSPLAY, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_ROCK_STAR, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_BELLE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_POP_STAR, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_PH_D, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_PHD, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_LIBRE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_ORIGINAL_CAP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_HOENN_CAP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_SINNOH_CAP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_UNOVA_CAP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_KALOS_CAP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_ALOLA_CAP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_ORIGINAL, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_HOENN, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_SINNOH, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_UNOVA, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_KALOS, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_ALOLA, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_PARTNER_CAP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_WORLD_CAP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_PARTNER, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_WORLD, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PIKACHU_STARTER, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SANDSHREW, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SANDSHREW_ALOLAN, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_SANDSHREW_ALOLA, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_NIDORAN_F, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_NIDORAN_M, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_CLEFAIRY, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_VULPIX, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_VULPIX_ALOLAN, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_VULPIX_ALOLA, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_JIGGLYPUFF, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_ODDISH, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_PARAS, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_MEOWTH, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_MEOWTH_ALOLAN, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_MEOWTH_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_MEOWTH_ALOLA, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_MEOWTH_GALAR, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_PSYDUCK, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_MANKEY, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_GROWLITHE, .jumpType = JUMP_TYPE_FAST, },
@ -478,7 +478,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_CUBONE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_DITTO, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_EEVEE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_EEVEE_PARTNER, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_EEVEE_STARTER, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_OMANYTE, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_KABUTO, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_CHIKORITA, .jumpType = JUMP_TYPE_SLOW, },
@ -495,7 +495,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_MARILL, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_SUNKERN, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_WOOPER, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_WOOPER_PALDEAN, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_WOOPER_PALDEA, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_PINECO, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_SNUBBULL, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SHUCKLE, .jumpType = JUMP_TYPE_SLOW, },
@ -516,9 +516,9 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_MARSHTOMP, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_POOCHYENA, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_ZIGZAGOON, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_ZIGZAGOON_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_ZIGZAGOON_GALAR, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_LINOONE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_LINOONE_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_LINOONE_GALAR, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_WURMPLE, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_SILCOON, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_CASCOON, .jumpType = JUMP_TYPE_SLOW, },
@ -567,8 +567,8 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_CHERUBI, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_CHERRIM_OVERCAST, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_CHERRIM_SUNSHINE, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_SHELLOS_WEST_SEA, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_SHELLOS_EAST_SEA, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_SHELLOS_WEST, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_SHELLOS_EAST, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_BUNEARY, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_GLAMEOW, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_STUNKY, .jumpType = JUMP_TYPE_NORMAL, },
@ -599,7 +599,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_PETILIL, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_SANDILE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_DARUMAKA, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_DARUMAKA_GALARIAN, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_DARUMAKA_GALAR, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_DWEBBLE, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_SCRAGGY, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_ARCHEN, .jumpType = JUMP_TYPE_NORMAL, },
@ -622,7 +622,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_CUBCHOO, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_SHELMET, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_STUNFISK, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_STUNFISK_GALARIAN, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_STUNFISK_GALAR, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_PAWNIARD, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_DURANT, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_CHESPIN, .jumpType = JUMP_TYPE_SLOW, },
@ -649,7 +649,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_SCATTERBUG_OCEAN, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_SCATTERBUG_JUNGLE, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_SCATTERBUG_FANCY, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_SCATTERBUG_POKE_BALL, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_SCATTERBUG_POKEBALL, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_SPEWPA_POLAR, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SPEWPA_TUNDRA, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SPEWPA_CONTINENTAL, .jumpType = JUMP_TYPE_NORMAL, },
@ -668,12 +668,12 @@ static const struct PokemonJumpMons sPokeJumpMons[] =
{ .species = SPECIES_SPEWPA_OCEAN, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SPEWPA_JUNGLE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SPEWPA_FANCY, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SPEWPA_POKE_BALL, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_SPEWPA_POKEBALL, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_LITLEO, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_PANCHAM, .jumpType = JUMP_TYPE_FAST, },
{ .species = SPECIES_ESPURR, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_MEOWSTIC_MALE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_MEOWSTIC_FEMALE, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_MEOWSTIC_M, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_MEOWSTIC_F, .jumpType = JUMP_TYPE_NORMAL, },
{ .species = SPECIES_BINACLE, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_CLAUNCHER, .jumpType = JUMP_TYPE_SLOW, },
{ .species = SPECIES_HELIOPTILE, .jumpType = JUMP_TYPE_NORMAL, },

4
test/battle/ability/cud_chew.c
View File

@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Cud Chew will activate Kee Berry effect again on the next tu
ASSUME(gItemsInfo[ITEM_KEE_BERRY].holdEffect == HOLD_EFFECT_KEE_BERRY);
ASSUME(gMovesInfo[MOVE_TACKLE].category == DAMAGE_CATEGORY_PHYSICAL);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_TAUROS_PALDEAN_COMBAT_BREED) { Ability(ABILITY_CUD_CHEW); Item(ITEM_KEE_BERRY); }
OPPONENT(SPECIES_TAUROS_PALDEA_COMBAT) { Ability(ABILITY_CUD_CHEW); Item(ITEM_KEE_BERRY); }
} WHEN {
TURN { MOVE(player, MOVE_TACKLE); }
TURN { MOVE(player, MOVE_CELEBRATE);}
@ -31,7 +31,7 @@ SINGLE_BATTLE_TEST("Cud Chew will activate Oran Berry effect again on the next t
ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].effect == EFFECT_FIXED_DAMAGE_ARG);
ASSUME(gMovesInfo[MOVE_DRAGON_RAGE].argument == 40);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_TAUROS_PALDEAN_COMBAT_BREED) { MaxHP(60); HP(60); Ability(ABILITY_CUD_CHEW); Item(ITEM_ORAN_BERRY); }
OPPONENT(SPECIES_TAUROS_PALDEA_COMBAT) { MaxHP(60); HP(60); Ability(ABILITY_CUD_CHEW); Item(ITEM_ORAN_BERRY); }
} WHEN {
TURN { MOVE(player, MOVE_DRAGON_RAGE); }
TURN { MOVE(player, MOVE_CELEBRATE);}

10
test/battle/ability/embody_aspect.c
View File

@ -6,10 +6,10 @@ SINGLE_BATTLE_TEST("Embody Aspect raises a stat depending on the users form by o
{
u16 species, ability;
PARAMETRIZE { species = SPECIES_OGERPON_TEAL_MASK_TERA; ability = ABILITY_EMBODY_ASPECT_TEAL_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_HEARTHFLAME_MASK_TERA; ability = ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_WELLSPRING_MASK_TERA; ability = ABILITY_EMBODY_ASPECT_WELLSPRING_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_CORNERSTONE_MASK_TERA; ability = ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_TEAL_TERA; ability = ABILITY_EMBODY_ASPECT_TEAL_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_HEARTHFLAME_TERA; ability = ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_WELLSPRING_TERA; ability = ABILITY_EMBODY_ASPECT_WELLSPRING_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_CORNERSTONE_TERA; ability = ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK; }
GIVEN {
PLAYER(SPECIES_WOBBUFFET);
@ -44,7 +44,7 @@ SINGLE_BATTLE_TEST("Embody Aspect activates when it's no longer effected by Neut
GIVEN {
PLAYER(SPECIES_WEEZING) { Ability(ABILITY_NEUTRALIZING_GAS); }
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_OGERPON_TEAL_MASK_TERA) { Ability(ABILITY_EMBODY_ASPECT_TEAL_MASK); }
OPPONENT(SPECIES_OGERPON_TEAL_TERA) { Ability(ABILITY_EMBODY_ASPECT_TEAL_MASK); }
} WHEN {
TURN { SWITCH(player, 1); }
} SCENE {

4
test/battle/ability/galvanize.c
View File

@ -11,7 +11,7 @@ SINGLE_BATTLE_TEST("Galvanize turns a normal type move into Electric")
{
GIVEN {
PLAYER(SPECIES_KRABBY);
OPPONENT(SPECIES_GEODUDE_ALOLAN) { Ability(ABILITY_GALVANIZE); }
OPPONENT(SPECIES_GEODUDE_ALOLA) { Ability(ABILITY_GALVANIZE); }
} WHEN {
TURN { MOVE(opponent, MOVE_TACKLE); }
} SCENE {
@ -33,7 +33,7 @@ SINGLE_BATTLE_TEST("Galvanize can not turn certain moves into Electric type move
ASSUME(gMovesInfo[MOVE_WEATHER_BALL].effect == EFFECT_WEATHER_BALL);
ASSUME(gMovesInfo[MOVE_MULTI_ATTACK].effect == EFFECT_CHANGE_TYPE_ON_ITEM);
PLAYER(SPECIES_KRABBY);
OPPONENT(SPECIES_GEODUDE_ALOLAN) { Ability(ABILITY_GALVANIZE); }
OPPONENT(SPECIES_GEODUDE_ALOLA) { Ability(ABILITY_GALVANIZE); }
} WHEN {
TURN { MOVE(opponent, move); }
} SCENE {

6
test/battle/ability/grim_neigh.c
View File

@ -5,7 +5,7 @@ DOUBLE_BATTLE_TEST("Grim Neigh raises Sp. Attack by one stage after directly cau
{
u32 species = 0, ability = 0, abilityPopUp = 0;
PARAMETRIZE { species = SPECIES_SPECTRIER; ability = ABILITY_GRIM_NEIGH; abilityPopUp = ABILITY_GRIM_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW_RIDER; ability = ABILITY_AS_ONE_SHADOW_RIDER; abilityPopUp = ABILITY_GRIM_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW; ability = ABILITY_AS_ONE_SHADOW_RIDER; abilityPopUp = ABILITY_GRIM_NEIGH; }
GIVEN {
ASSUME(gMovesInfo[MOVE_DISCHARGE].target == MOVE_TARGET_FOES_AND_ALLY);
PLAYER(species) { Ability(ability); }
@ -41,7 +41,7 @@ DOUBLE_BATTLE_TEST("Grim Neigh does not trigger if Pokemon faint to indirect dam
{
u32 species = 0, ability = 0, abilityPopUp = 0;
PARAMETRIZE { species = SPECIES_SPECTRIER; ability = ABILITY_GRIM_NEIGH; abilityPopUp = ABILITY_GRIM_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW_RIDER; ability = ABILITY_AS_ONE_SHADOW_RIDER; abilityPopUp = ABILITY_GRIM_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW; ability = ABILITY_AS_ONE_SHADOW_RIDER; abilityPopUp = ABILITY_GRIM_NEIGH; }
GIVEN {
PLAYER(species) { Ability(ability); }
PLAYER(SPECIES_SNORUNT) { HP(1); Status1(STATUS1_POISON); }
@ -78,7 +78,7 @@ DOUBLE_BATTLE_TEST("Grim Neigh does not increase damage done by the same move th
s16 damage[2];
u32 species = 0, ability = 0, abilityPopUp = 0;
PARAMETRIZE { species = SPECIES_SPECTRIER; ability = ABILITY_GRIM_NEIGH; abilityPopUp = ABILITY_GRIM_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW_RIDER; ability = ABILITY_AS_ONE_SHADOW_RIDER; abilityPopUp = ABILITY_GRIM_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW; ability = ABILITY_AS_ONE_SHADOW_RIDER; abilityPopUp = ABILITY_GRIM_NEIGH; }
KNOWN_FAILING; // Requires simultaneous damage implementation
GIVEN {

8
test/battle/ability/moxie.c
View File

@ -6,7 +6,7 @@ DOUBLE_BATTLE_TEST("Moxie/Chilling Neigh raises Attack by one stage after direct
u32 species = 0, ability = 0, abilityPopUp = 0;
PARAMETRIZE { species = SPECIES_SALAMENCE; ability = ABILITY_MOXIE; abilityPopUp = ABILITY_MOXIE; }
PARAMETRIZE { species = SPECIES_GLASTRIER; ability = ABILITY_CHILLING_NEIGH; abilityPopUp = ABILITY_CHILLING_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE_RIDER; ability = ABILITY_AS_ONE_ICE_RIDER; abilityPopUp = ABILITY_CHILLING_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE; ability = ABILITY_AS_ONE_ICE_RIDER; abilityPopUp = ABILITY_CHILLING_NEIGH; }
GIVEN {
ASSUME(gMovesInfo[MOVE_EARTHQUAKE].target == MOVE_TARGET_FOES_AND_ALLY);
PLAYER(species) { Ability(ability); }
@ -45,7 +45,7 @@ DOUBLE_BATTLE_TEST("Moxie/Chilling Neigh does not trigger if Pokemon faint to in
u32 species = 0, ability = 0, abilityPopUp = 0;
PARAMETRIZE { species = SPECIES_SALAMENCE; ability = ABILITY_MOXIE; abilityPopUp = ABILITY_MOXIE; }
PARAMETRIZE { species = SPECIES_GLASTRIER; ability = ABILITY_CHILLING_NEIGH; abilityPopUp = ABILITY_CHILLING_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE_RIDER; ability = ABILITY_AS_ONE_ICE_RIDER; abilityPopUp = ABILITY_CHILLING_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE; ability = ABILITY_AS_ONE_ICE_RIDER; abilityPopUp = ABILITY_CHILLING_NEIGH; }
GIVEN {
PLAYER(species) { Ability(ability); }
PLAYER(SPECIES_SNORUNT) { HP(1); Status1(STATUS1_POISON); }
@ -82,7 +82,7 @@ SINGLE_BATTLE_TEST("Moxie/Chilling Neigh does not trigger when already at maximu
u32 species = 0, ability = 0, abilityPopUp = 0;
PARAMETRIZE { species = SPECIES_SALAMENCE; ability = ABILITY_MOXIE; abilityPopUp = ABILITY_MOXIE; }
PARAMETRIZE { species = SPECIES_GLASTRIER; ability = ABILITY_CHILLING_NEIGH; abilityPopUp = ABILITY_CHILLING_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE_RIDER; ability = ABILITY_AS_ONE_ICE_RIDER; abilityPopUp = ABILITY_CHILLING_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE; ability = ABILITY_AS_ONE_ICE_RIDER; abilityPopUp = ABILITY_CHILLING_NEIGH; }
GIVEN {
ASSUME(gMovesInfo[MOVE_BELLY_DRUM].effect == EFFECT_BELLY_DRUM);
PLAYER(species) { Ability(ability); }
@ -120,7 +120,7 @@ DOUBLE_BATTLE_TEST("Moxie/Chilling Neigh does not increase damage done by the sa
u32 species = 0, ability = 0, abilityPopUp = 0;
PARAMETRIZE { species = SPECIES_SALAMENCE; ability = ABILITY_MOXIE; abilityPopUp = ABILITY_MOXIE; }
PARAMETRIZE { species = SPECIES_GLASTRIER; ability = ABILITY_CHILLING_NEIGH; abilityPopUp = ABILITY_CHILLING_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE_RIDER; ability = ABILITY_AS_ONE_ICE_RIDER; abilityPopUp = ABILITY_CHILLING_NEIGH; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE; ability = ABILITY_AS_ONE_ICE_RIDER; abilityPopUp = ABILITY_CHILLING_NEIGH; }
KNOWN_FAILING; // Requires simultaneous damage implementation
GIVEN {

4
test/battle/ability/mummy.c
View File

@ -81,8 +81,8 @@ SINGLE_BATTLE_TEST("Mummy doesn't replace abilities that can't be suppressed")
PARAMETRIZE { species = SPECIES_CRAMORANT; ability = ABILITY_GULP_MISSILE; }
PARAMETRIZE { species = SPECIES_PALAFIN_ZERO; ability = ABILITY_ZERO_TO_HERO; }
PARAMETRIZE { species = SPECIES_TATSUGIRI; ability = ABILITY_COMMANDER; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW_RIDER; ability = ABILITY_AS_ONE_SHADOW_RIDER; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE_RIDER; ability = ABILITY_AS_ONE_ICE_RIDER; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW; ability = ABILITY_AS_ONE_SHADOW_RIDER; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE; ability = ABILITY_AS_ONE_ICE_RIDER; }
GIVEN {
PLAYER(SPECIES_YAMASK);

20
test/battle/ability/pastel_veil.c
View File

@ -6,7 +6,7 @@ SINGLE_BATTLE_TEST("Pastel Veil prevents Poison Sting poison")
GIVEN {
ASSUME(MoveHasAdditionalEffect(MOVE_POISON_STING, MOVE_EFFECT_POISON) == TRUE);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
} WHEN {
TURN { MOVE(player, MOVE_POISON_STING); }
} SCENE {
@ -21,7 +21,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil prevents Poison Sting poison on partner")
ASSUME(MoveHasAdditionalEffect(MOVE_POISON_STING, MOVE_EFFECT_POISON) == TRUE);
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_WYNAUT);
} WHEN {
TURN { MOVE(playerLeft, MOVE_POISON_STING, target: opponentRight); }
@ -37,7 +37,7 @@ SINGLE_BATTLE_TEST("Pastel Veil immediately cures Mold Breaker poison")
GIVEN {
ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); }
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
} WHEN {
TURN { MOVE(player, MOVE_TOXIC); MOVE(opponent, MOVE_TACKLE); }
} SCENE {
@ -56,7 +56,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil does not cure Mold Breaker poison on partner")
ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); }
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_WYNAUT);
} WHEN {
TURN { MOVE(playerLeft, MOVE_TOXIC, target: opponentRight); }
@ -72,7 +72,7 @@ SINGLE_BATTLE_TEST("Pastel Veil prevents Toxic bad poison")
GIVEN {
ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
} WHEN {
TURN { MOVE(player, MOVE_TOXIC); }
} SCENE {
@ -89,7 +89,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil prevents Toxic bad poison on partner")
ASSUME(gMovesInfo[MOVE_TOXIC].effect == EFFECT_TOXIC);
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_WYNAUT);
} WHEN {
TURN { MOVE(playerLeft, MOVE_TOXIC, target: opponentRight); }
@ -107,7 +107,7 @@ SINGLE_BATTLE_TEST("Pastel Veil prevents Toxic Spikes poison")
ASSUME(gMovesInfo[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
} WHEN {
TURN { MOVE(player, MOVE_TOXIC_SPIKES); }
TURN { SWITCH(opponent, 1); }
@ -123,7 +123,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil prevents Toxic Spikes poison on partner")
ASSUME(gMovesInfo[MOVE_TOXIC_SPIKES].effect == EFFECT_TOXIC_SPIKES);
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WYNAUT);
} WHEN {
@ -141,7 +141,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil cures partner's poison on initial switch in")
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_POISON); }
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
} WHEN {
TURN {}
} SCENE {
@ -159,7 +159,7 @@ DOUBLE_BATTLE_TEST("Pastel Veil cures partner's poison on switch in")
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_POISON); }
OPPONENT(SPECIES_WYNAUT);
OPPONENT(SPECIES_PONYTA_GALARIAN) { Ability(ABILITY_PASTEL_VEIL); }
OPPONENT(SPECIES_PONYTA_GALAR) { Ability(ABILITY_PASTEL_VEIL); }
} WHEN {
TURN { SWITCH(opponentRight, 2); }
} SCENE {

4
test/battle/ability/quick_draw.c
View File

@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Quick Draw has a 30% chance of going first")
{
PASSES_RANDOMLY(3, 10, RNG_QUICK_DRAW);
GIVEN {
PLAYER(SPECIES_SLOWBRO_GALARIAN) { Ability(ABILITY_QUICK_DRAW); Speed(1); }
PLAYER(SPECIES_SLOWBRO_GALAR) { Ability(ABILITY_QUICK_DRAW); Speed(1); }
OPPONENT(SPECIES_WOBBUFFET) { Speed(100); }
} WHEN {
TURN { MOVE(player, MOVE_TACKLE); }
@ -20,7 +20,7 @@ SINGLE_BATTLE_TEST("Quick Draw does not activate 70% of the time")
{
PASSES_RANDOMLY(7, 10, RNG_QUICK_DRAW);
GIVEN {
PLAYER(SPECIES_SLOWBRO_GALARIAN) { Ability(ABILITY_QUICK_DRAW); Speed(1); }
PLAYER(SPECIES_SLOWBRO_GALAR) { Ability(ABILITY_QUICK_DRAW); Speed(1); }
OPPONENT(SPECIES_WOBBUFFET) { Speed(100); }
} WHEN {
TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_TACKLE); }

4
test/battle/ability/storm_drain.c
View File

@ -6,7 +6,7 @@ SINGLE_BATTLE_TEST("Storm Drain absorbs Water-type moves and increases the Sp. A
GIVEN {
ASSUME(gMovesInfo[MOVE_WATER_GUN].type == TYPE_WATER);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_GASTRODON_EAST_SEA) { Ability(ABILITY_STORM_DRAIN); }
OPPONENT(SPECIES_GASTRODON_EAST) { Ability(ABILITY_STORM_DRAIN); }
} WHEN {
TURN { MOVE(player, MOVE_WATER_GUN); MOVE(opponent, MOVE_CELEBRATE); }
} SCENE {
@ -37,7 +37,7 @@ DOUBLE_BATTLE_TEST("Storm Drain forces single-target Water-type moves to target
ASSUME(gMovesInfo[MOVE_WATER_GUN].type == TYPE_WATER);
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_GASTRODON_EAST_SEA) { Ability(ABILITY_STORM_DRAIN); }
OPPONENT(SPECIES_GASTRODON_EAST) { Ability(ABILITY_STORM_DRAIN); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN {

4
test/battle/ability/switch_in_abilities.c
View File

@ -101,8 +101,8 @@ DOUBLE_BATTLE_TEST("Switch-in abilities trigger in Speed Order after post-KO swi
PLAYER(SPECIES_GYARADOS) { Speed(spdPlayer2); Ability(ABILITY_INTIMIDATE); }
OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(1); }
OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(1); }
OPPONENT(SPECIES_WEEZING_GALARIAN) { Speed(spdOpponent1); Ability(ABILITY_MISTY_SURGE); }
OPPONENT(SPECIES_VULPIX_ALOLAN) { Speed(spdOpponent2); Ability(ABILITY_SNOW_WARNING); }
OPPONENT(SPECIES_WEEZING_GALAR) { Speed(spdOpponent1); Ability(ABILITY_MISTY_SURGE); }
OPPONENT(SPECIES_VULPIX_ALOLA) { Speed(spdOpponent2); Ability(ABILITY_SNOW_WARNING); }
} WHEN {
TURN { MOVE(playerLeft, MOVE_EXPLOSION); SEND_OUT(playerLeft, 2); SEND_OUT(opponentLeft, 2); SEND_OUT(playerRight, 3); SEND_OUT(opponentRight, 3); }
TURN { ; }

4
test/battle/ability/volt_absorb.c
View File

@ -51,7 +51,7 @@ SINGLE_BATTLE_TEST("Volt Absorb is only triggered once on multi strike moves")
ASSUME(gMovesInfo[MOVE_FURY_SWIPES].type == TYPE_NORMAL);
ASSUME(gMovesInfo[MOVE_FURY_SWIPES].effect == EFFECT_MULTI_HIT);
PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); }
OPPONENT(SPECIES_GRAVELER_ALOLAN) { Ability(ABILITY_GALVANIZE); }
OPPONENT(SPECIES_GRAVELER_ALOLA) { Ability(ABILITY_GALVANIZE); }
} WHEN {
TURN { MOVE(opponent, MOVE_FURY_SWIPES); }
} SCENE {
@ -69,7 +69,7 @@ DOUBLE_BATTLE_TEST("Volt Absorb does not stop Electric Typed Explosion from dama
ASSUME(gMovesInfo[MOVE_EXPLOSION].type == TYPE_NORMAL);
PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); }
PLAYER(SPECIES_ABRA);
OPPONENT(SPECIES_GRAVELER_ALOLAN) { Ability(ABILITY_GALVANIZE); }
OPPONENT(SPECIES_GRAVELER_ALOLA) { Ability(ABILITY_GALVANIZE); }
OPPONENT(SPECIES_WYNAUT);
} WHEN {
TURN { MOVE(opponentLeft, MOVE_EXPLOSION); }

12
test/battle/ability/zen_mode.c
View File

@ -4,8 +4,8 @@
SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is half or less at the end of the turn")
{
u16 standardSpecies, zenSpecies;
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_GALARIAN_ZEN_MODE; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD; zenSpecies = SPECIES_DARMANITAN_ZEN; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALAR_STANDARD; zenSpecies = SPECIES_DARMANITAN_GALAR_ZEN; }
GIVEN {
ASSUME(gSpeciesInfo[standardSpecies].baseHP == 105);
@ -33,8 +33,8 @@ SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is half or less
SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is half or less before the first turn")
{
u16 standardSpecies, zenSpecies;
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_GALARIAN_ZEN_MODE; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD; zenSpecies = SPECIES_DARMANITAN_ZEN; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALAR_STANDARD; zenSpecies = SPECIES_DARMANITAN_GALAR_ZEN; }
GIVEN {
ASSUME(gSpeciesInfo[standardSpecies].baseHP == 105);
@ -61,8 +61,8 @@ SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is half or less
SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is healed above half")
{
u16 standardSpecies, zenSpecies;
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_GALARIAN_ZEN_MODE; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD; zenSpecies = SPECIES_DARMANITAN_ZEN; }
PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALAR_STANDARD; zenSpecies = SPECIES_DARMANITAN_GALAR_ZEN; }
GIVEN {
ASSUME(gSpeciesInfo[standardSpecies].baseHP == 105);

6
test/battle/ai/ai_switching.c
View File

@ -88,7 +88,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: Number of hits to KO calculati
PLAYER(SPECIES_VENUSAUR) { Level(30); Moves(MOVE_TACKLE); }
// Opponent party courtesy of Skolgrahd, who triggered the bug in the first place
OPPONENT(SPECIES_PIKACHU) { Level(100); Moves(MOVE_ZIPPY_ZAP, MOVE_EXTREME_SPEED, MOVE_IRON_TAIL, MOVE_KNOCK_OFF); }
OPPONENT(SPECIES_NINETALES_ALOLAN) { Level(100); Moves(MOVE_AURORA_VEIL, MOVE_BLIZZARD, MOVE_MOONBLAST, MOVE_DISABLE); }
OPPONENT(SPECIES_NINETALES_ALOLA) { Level(100); Moves(MOVE_AURORA_VEIL, MOVE_BLIZZARD, MOVE_MOONBLAST, MOVE_DISABLE); }
OPPONENT(SPECIES_WEAVILE) { Level(100); Moves(MOVE_NIGHT_SLASH, MOVE_TRIPLE_AXEL, MOVE_ICE_SHARD, MOVE_FAKE_OUT); }
OPPONENT(SPECIES_DITTO) { Level(100); Moves(MOVE_TRANSFORM); }
OPPONENT(SPECIES_TYPHLOSION) { Level(100); Moves(MOVE_ERUPTION, MOVE_HEAT_WAVE, MOVE_FOCUS_BLAST, MOVE_EXTRASENSORY); }
@ -122,9 +122,9 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: Avoid infinite loop if damage
GIVEN {
ASSUME(gItemsInfo[ITEM_LEFTOVERS].holdEffect == HOLD_EFFECT_LEFTOVERS);
AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SMART_MON_CHOICES);
PLAYER(SPECIES_MEOWTH_GALARIAN) { Level(100); Moves(MOVE_GROWL, MOVE_FAKE_OUT, MOVE_HONE_CLAWS); }
PLAYER(SPECIES_MEOWTH_GALAR) { Level(100); Moves(MOVE_GROWL, MOVE_FAKE_OUT, MOVE_HONE_CLAWS); }
// Scenario courtesy of Duke, who triggered the bug in the first place
OPPONENT(SPECIES_MEOWTH_GALARIAN) { Level(5); Moves(MOVE_GROWL, MOVE_FAKE_OUT, MOVE_HONE_CLAWS); }
OPPONENT(SPECIES_MEOWTH_GALAR) { Level(5); Moves(MOVE_GROWL, MOVE_FAKE_OUT, MOVE_HONE_CLAWS); }
OPPONENT(SPECIES_GEODUDE) { Level(5); Moves(MOVE_DOUBLE_EDGE); }
OPPONENT(SPECIES_GEODUDE) { Level(5); Moves(MOVE_DOUBLE_EDGE); }
OPPONENT(SPECIES_NOSEPASS) { Level(5); Moves(MOVE_DOUBLE_EDGE); }

2
test/battle/crit_chance.c
View File

@ -215,7 +215,7 @@ SINGLE_BATTLE_TEST("Crit Chance: Signature items Leek and Lucky Punch increase t
PASSES_RANDOMLY(1, 2, RNG_CRITICAL_HIT);
PARAMETRIZE { species = SPECIES_FARFETCHD; item = ITEM_LEEK; }
PARAMETRIZE { species = SPECIES_FARFETCHD_GALARIAN; item = ITEM_LEEK; }
PARAMETRIZE { species = SPECIES_FARFETCHD_GALAR; item = ITEM_LEEK; }
PARAMETRIZE { species = SPECIES_SIRFETCHD; item = ITEM_LEEK; }
PARAMETRIZE { species = SPECIES_CHANSEY; item = ITEM_LUCKY_PUNCH; }

20
test/battle/form_change/begin_battle.c
View File

@ -19,27 +19,27 @@ SINGLE_BATTLE_TEST("Zacian changes into its Crowned Form when holding the Rusted
PARAMETRIZE { item = ITEM_NONE; }
PARAMETRIZE { item = ITEM_RUSTED_SWORD; }
GIVEN {
PLAYER(SPECIES_ZACIAN_HERO_OF_MANY_BATTLES) { Item(item); }
PLAYER(SPECIES_ZACIAN_HERO) { Item(item); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CELEBRATE); }
} THEN {
if (item == ITEM_NONE)
EXPECT_EQ(player->species, SPECIES_ZACIAN_HERO_OF_MANY_BATTLES);
EXPECT_EQ(player->species, SPECIES_ZACIAN_HERO);
else
EXPECT_EQ(player->species, SPECIES_ZACIAN_CROWNED_SWORD);
EXPECT_EQ(player->species, SPECIES_ZACIAN_CROWNED);
}
}
SINGLE_BATTLE_TEST("Zacian's Iron Head becomes Behemoth Blade upon form change")
{
GIVEN {
PLAYER(SPECIES_ZACIAN_HERO_OF_MANY_BATTLES) { Item(ITEM_RUSTED_SWORD); Moves(MOVE_IRON_HEAD, MOVE_CELEBRATE); }
PLAYER(SPECIES_ZACIAN_HERO) { Item(ITEM_RUSTED_SWORD); Moves(MOVE_IRON_HEAD, MOVE_CELEBRATE); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CELEBRATE); }
} THEN {
ASSUME(player->species == SPECIES_ZACIAN_CROWNED_SWORD); // Assumes form change worked.
ASSUME(player->species == SPECIES_ZACIAN_CROWNED); // Assumes form change worked.
EXPECT_EQ(player->moves[0], MOVE_BEHEMOTH_BLADE);
}
}
@ -50,27 +50,27 @@ SINGLE_BATTLE_TEST("Zamazenta changes into its Crowned Form when holding the Rus
PARAMETRIZE { item = ITEM_NONE; }
PARAMETRIZE { item = ITEM_RUSTED_SHIELD; }
GIVEN {
PLAYER(SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES) { Item(item); }
PLAYER(SPECIES_ZAMAZENTA_HERO) { Item(item); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CELEBRATE); }
} THEN {
if (item == ITEM_NONE)
EXPECT_EQ(player->species, SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES);
EXPECT_EQ(player->species, SPECIES_ZAMAZENTA_HERO);
else
EXPECT_EQ(player->species, SPECIES_ZAMAZENTA_CROWNED_SHIELD);
EXPECT_EQ(player->species, SPECIES_ZAMAZENTA_CROWNED);
}
}
SINGLE_BATTLE_TEST("Zamazenta's Iron Head becomes Behemoth Bash upon form change")
{
GIVEN {
PLAYER(SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES) { Item(ITEM_RUSTED_SHIELD); Moves(MOVE_IRON_HEAD, MOVE_CELEBRATE); }
PLAYER(SPECIES_ZAMAZENTA_HERO) { Item(ITEM_RUSTED_SHIELD); Moves(MOVE_IRON_HEAD, MOVE_CELEBRATE); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CELEBRATE); }
} THEN {
ASSUME(player->species == SPECIES_ZAMAZENTA_CROWNED_SHIELD); // Assumes form change worked.
ASSUME(player->species == SPECIES_ZAMAZENTA_CROWNED); // Assumes form change worked.
EXPECT_EQ(player->moves[0], MOVE_BEHEMOTH_BASH);
}
}

2
test/battle/gimmick/dynamax.c
View File

@ -457,7 +457,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Pokemon with Gigantamax forms change upon Dynamaxi
u32 species;
bool32 gigantamaxFactor;
PARAMETRIZE { gigantamaxFactor = FALSE; species = SPECIES_VENUSAUR; }
PARAMETRIZE { gigantamaxFactor = TRUE; species = SPECIES_VENUSAUR_GIGANTAMAX; }
PARAMETRIZE { gigantamaxFactor = TRUE; species = SPECIES_VENUSAUR_GMAX; }
GIVEN {
PLAYER(SPECIES_VENUSAUR) { GigantamaxFactor(gigantamaxFactor); }
OPPONENT(SPECIES_WOBBUFFET);

8
test/battle/gimmick/terastal.c
View File

@ -790,10 +790,10 @@ SINGLE_BATTLE_TEST("(TERA) Transformed pokemon can't Terastalize")
SINGLE_BATTLE_TEST("(TERA) Pokemon with Tera forms change upon Terastallizing")
{
u32 species, targetSpecies;
PARAMETRIZE { species = SPECIES_OGERPON_TEAL_MASK; targetSpecies = SPECIES_OGERPON_TEAL_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_WELLSPRING_MASK; targetSpecies = SPECIES_OGERPON_WELLSPRING_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_HEARTHFLAME_MASK; targetSpecies = SPECIES_OGERPON_HEARTHFLAME_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_CORNERSTONE_MASK; targetSpecies = SPECIES_OGERPON_CORNERSTONE_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_TEAL; targetSpecies = SPECIES_OGERPON_TEAL_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_WELLSPRING; targetSpecies = SPECIES_OGERPON_WELLSPRING_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_HEARTHFLAME; targetSpecies = SPECIES_OGERPON_HEARTHFLAME_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_CORNERSTONE; targetSpecies = SPECIES_OGERPON_CORNERSTONE_TERA; }
PARAMETRIZE { species = SPECIES_TERAPAGOS_TERASTAL; targetSpecies = SPECIES_TERAPAGOS_STELLAR; }
GIVEN {
PLAYER(species);

8
test/battle/hold_effect/ogerpon_mask.c
View File

@ -15,10 +15,10 @@ SINGLE_BATTLE_TEST("Ogerpon Masks increase the base power of moves by 20%", s16
{
u32 species;
u32 item;
PARAMETRIZE { species = SPECIES_OGERPON_TEAL_MASK; item = ITEM_NONE; }
PARAMETRIZE { species = SPECIES_OGERPON_WELLSPRING_MASK; item = ITEM_CORNERSTONE_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_HEARTHFLAME_MASK; item = ITEM_WELLSPRING_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_CORNERSTONE_MASK; item = ITEM_HEARTHFLAME_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_TEAL; item = ITEM_NONE; }
PARAMETRIZE { species = SPECIES_OGERPON_WELLSPRING; item = ITEM_CORNERSTONE_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_HEARTHFLAME; item = ITEM_WELLSPRING_MASK; }
PARAMETRIZE { species = SPECIES_OGERPON_CORNERSTONE; item = ITEM_HEARTHFLAME_MASK; }
GIVEN {
ASSUME(gMovesInfo[MOVE_TACKLE].power > 0);

2
test/battle/hold_effect/protective_pads.c
View File

@ -46,7 +46,7 @@ SINGLE_BATTLE_TEST("Protective Pads doesn't reduce tough claws damage", s16 dama
SINGLE_BATTLE_TEST("Protective Pads doesn't invalid unseen fist")
{
GIVEN {
PLAYER(SPECIES_URSHIFU_RAPID_STRIKE_STYLE) { Ability(ABILITY_UNSEEN_FIST); Item(ITEM_PROTECTIVE_PADS); }
PLAYER(SPECIES_URSHIFU_RAPID_STRIKE) { Ability(ABILITY_UNSEEN_FIST); Item(ITEM_PROTECTIVE_PADS); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(opponent, MOVE_PROTECT); MOVE(player, MOVE_TACKLE); }

4
test/battle/hold_effect/restore_stats.c
View File

@ -99,8 +99,8 @@ SINGLE_BATTLE_TEST("White Herb restores stats after all hits of a multi hit move
u16 species;
u16 ability;
PARAMETRIZE { species = SPECIES_SLIGGOO_HISUIAN; ability = ABILITY_GOOEY; }
PARAMETRIZE { species = SPECIES_DUGTRIO_ALOLAN; ability = ABILITY_TANGLING_HAIR; }
PARAMETRIZE { species = SPECIES_SLIGGOO_HISUI; ability = ABILITY_GOOEY; }
PARAMETRIZE { species = SPECIES_DUGTRIO_ALOLA; ability = ABILITY_TANGLING_HAIR; }
GIVEN {
ASSUME(gMovesInfo[MOVE_DUAL_WINGBEAT].strikeCount == 2);

16
test/battle/move_effect/chilly_reception.c
View File

@ -9,8 +9,8 @@ ASSUMPTIONS
SINGLE_BATTLE_TEST("Chilly Reception sets up snow and switches the user out")
{
GIVEN {
PLAYER(SPECIES_SLOWKING_GALARIAN);
PLAYER(SPECIES_SLOWPOKE_GALARIAN);
PLAYER(SPECIES_SLOWKING_GALAR);
PLAYER(SPECIES_SLOWPOKE_GALAR);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CHILLY_RECEPTION); SEND_OUT(player, 1); }
@ -27,8 +27,8 @@ SINGLE_BATTLE_TEST("Chilly Reception sets up snow and switches the user out")
SINGLE_BATTLE_TEST("Chilly Reception switches the user out, even if the weather does not change")
{
GIVEN {
PLAYER(SPECIES_SLOWKING_GALARIAN);
PLAYER(SPECIES_SLOWPOKE_GALARIAN);
PLAYER(SPECIES_SLOWKING_GALAR);
PLAYER(SPECIES_SLOWPOKE_GALAR);
OPPONENT(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); }
} WHEN {
TURN { MOVE(player, MOVE_CHILLY_RECEPTION); SEND_OUT(player, 1); }
@ -45,7 +45,7 @@ SINGLE_BATTLE_TEST("Chilly Reception switches the user out, even if the weather
SINGLE_BATTLE_TEST("Chilly Reception does not switch the user out if no replacements")
{
GIVEN {
PLAYER(SPECIES_SLOWKING_GALARIAN);
PLAYER(SPECIES_SLOWKING_GALAR);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CHILLY_RECEPTION); }
@ -60,8 +60,8 @@ SINGLE_BATTLE_TEST("Chilly Reception does not switch the user out if no replacem
SINGLE_BATTLE_TEST("Chilly Reception does not switch the user out if replacements fainted")
{
GIVEN {
PLAYER(SPECIES_SLOWKING_GALARIAN);
PLAYER(SPECIES_SLOWPOKE_GALARIAN) { HP(0); }
PLAYER(SPECIES_SLOWKING_GALAR);
PLAYER(SPECIES_SLOWPOKE_GALAR) { HP(0); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CHILLY_RECEPTION); }
@ -76,7 +76,7 @@ SINGLE_BATTLE_TEST("Chilly Reception does not switch the user out if replacement
SINGLE_BATTLE_TEST("Chilly Reception changes the weather, even if the user cannot switch out")
{
GIVEN {
PLAYER(SPECIES_SLOWKING_GALARIAN);
PLAYER(SPECIES_SLOWKING_GALAR);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CHILLY_RECEPTION); }

2
test/battle/move_effect/explosion.c
View File

@ -127,7 +127,7 @@ SINGLE_BATTLE_TEST("Explosion does not trigger Destiny Bond")
DOUBLE_BATTLE_TEST("Explosion boosted by Galvanize is correctly blocked by Volt Absorb")
{
GIVEN {
PLAYER(SPECIES_GEODUDE_ALOLAN) { Ability(ABILITY_GALVANIZE); }
PLAYER(SPECIES_GEODUDE_ALOLA) { Ability(ABILITY_GALVANIZE); }
PLAYER(SPECIES_WYNAUT) { HP(1); }
OPPONENT(SPECIES_LANTURN) { Ability(ABILITY_VOLT_ABSORB); }
OPPONENT(SPECIES_WOBBUFFET) { HP(1); }

4
test/battle/move_effect/gastro_acid.c
View File

@ -26,8 +26,8 @@ SINGLE_BATTLE_TEST("Gastro Acid fails if target has a banned ability")
// Needs confirmation since those abilities can be suppressed by Neutralizing Gas
// PARAMETRIZE { species = SPECIES_IRON_MOTH; ability = ABILITY_QUARK_DRIVE; }
// PARAMETRIZE { species = SPECIES_WALKING_WAKE; ability = ABILITY_PROTOSYNTHESIS; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW_RIDER; ability = ABILITY_AS_ONE_SHADOW_RIDER; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE_RIDER; ability = ABILITY_AS_ONE_ICE_RIDER; }
PARAMETRIZE { species = SPECIES_CALYREX_SHADOW; ability = ABILITY_AS_ONE_SHADOW_RIDER; }
PARAMETRIZE { species = SPECIES_CALYREX_ICE; ability = ABILITY_AS_ONE_ICE_RIDER; }
GIVEN {
PLAYER(SPECIES_WOBBUFFET);

8
test/battle/move_effect/ivy_cudgel.c
View File

@ -12,10 +12,10 @@ SINGLE_BATTLE_TEST("Ivy Cudgel changes the move type depending on the form of Og
u16 ogerpon;
u16 item;
PARAMETRIZE { species = SPECIES_BLASTOISE; ogerpon = SPECIES_OGERPON_TEAL_MASK; item = ITEM_NONE; }
PARAMETRIZE { species = SPECIES_CHARIZARD; ogerpon = SPECIES_OGERPON_CORNERSTONE_MASK; item = ITEM_CORNERSTONE_MASK; }
PARAMETRIZE { species = SPECIES_CHARIZARD; ogerpon = SPECIES_OGERPON_WELLSPRING_MASK; item = ITEM_WELLSPRING_MASK; }
PARAMETRIZE { species = SPECIES_VENUSAUR; ogerpon = SPECIES_OGERPON_HEARTHFLAME_MASK; item = ITEM_HEARTHFLAME_MASK; }
PARAMETRIZE { species = SPECIES_BLASTOISE; ogerpon = SPECIES_OGERPON_TEAL; item = ITEM_NONE; }
PARAMETRIZE { species = SPECIES_CHARIZARD; ogerpon = SPECIES_OGERPON_CORNERSTONE; item = ITEM_CORNERSTONE_MASK; }
PARAMETRIZE { species = SPECIES_CHARIZARD; ogerpon = SPECIES_OGERPON_WELLSPRING; item = ITEM_WELLSPRING_MASK; }
PARAMETRIZE { species = SPECIES_VENUSAUR; ogerpon = SPECIES_OGERPON_HEARTHFLAME; item = ITEM_HEARTHFLAME_MASK; }
GIVEN {
PLAYER(ogerpon) { Item(item); }

6
test/battle/move_effect/raging_bull.c
View File

@ -143,9 +143,9 @@ SINGLE_BATTLE_TEST("Move Raging Bull changes it's type depending on the Tauros F
u16 speciesPlayer;
u16 speciesOpponent;
PARAMETRIZE { speciesPlayer = SPECIES_TAUROS_PALDEAN_COMBAT_BREED; speciesOpponent = SPECIES_CHARIZARD; }
PARAMETRIZE { speciesPlayer = SPECIES_TAUROS_PALDEAN_BLAZE_BREED; speciesOpponent = SPECIES_BLASTOISE; }
PARAMETRIZE { speciesPlayer = SPECIES_TAUROS_PALDEAN_AQUA_BREED; speciesOpponent = SPECIES_VENUSAUR; }
PARAMETRIZE { speciesPlayer = SPECIES_TAUROS_PALDEA_COMBAT; speciesOpponent = SPECIES_CHARIZARD; }
PARAMETRIZE { speciesPlayer = SPECIES_TAUROS_PALDEA_BLAZE; speciesOpponent = SPECIES_BLASTOISE; }
PARAMETRIZE { speciesPlayer = SPECIES_TAUROS_PALDEA_AQUA; speciesOpponent = SPECIES_VENUSAUR; }
GIVEN {
PLAYER(speciesPlayer);

2
test/battle/move_effect/role_play.c
View File

@ -19,7 +19,7 @@ SINGLE_BATTLE_TEST("Role Play fails if target has a banned ability")
PARAMETRIZE { species = SPECIES_DARMANITAN; ability = ABILITY_ZEN_MODE; }
PARAMETRIZE { species = SPECIES_DITTO; ability = ABILITY_IMPOSTER; }
PARAMETRIZE { species = SPECIES_AEGISLASH; ability = ABILITY_STANCE_CHANGE; }
PARAMETRIZE { species = SPECIES_MUK_ALOLAN; ability = ABILITY_POWER_OF_ALCHEMY; }
PARAMETRIZE { species = SPECIES_MUK_ALOLA; ability = ABILITY_POWER_OF_ALCHEMY; }
PARAMETRIZE { species = SPECIES_PASSIMIAN; ability = ABILITY_RECEIVER; }
PARAMETRIZE { species = SPECIES_WISHIWASHI; ability = ABILITY_SCHOOLING; }
PARAMETRIZE { species = SPECIES_KOMALA; ability = ABILITY_COMATOSE; }

6
test/battle/move_effect_secondary/freeze.c
View File

@ -90,11 +90,11 @@ SINGLE_BATTLE_TEST("Freezing Glare shouldn't freeze Psychic-types")
#endif
{
GIVEN {
ASSUME(gSpeciesInfo[SPECIES_ARTICUNO_GALARIAN].types[0] == TYPE_PSYCHIC);
ASSUME(gSpeciesInfo[SPECIES_ARTICUNO_GALAR].types[0] == TYPE_PSYCHIC);
ASSUME(MoveHasAdditionalEffect(MOVE_FREEZING_GLARE, MOVE_EFFECT_FREEZE_OR_FROSTBITE) == TRUE);
ASSUME(gMovesInfo[MOVE_FREEZING_GLARE].type == TYPE_PSYCHIC);
PLAYER(SPECIES_ARTICUNO_GALARIAN);
OPPONENT(SPECIES_ARTICUNO_GALARIAN);
PLAYER(SPECIES_ARTICUNO_GALAR);
OPPONENT(SPECIES_ARTICUNO_GALAR);
} WHEN {
TURN { MOVE(player, MOVE_FREEZING_GLARE); }
} SCENE {

2
test/battle/terrain/electric.c
View File

@ -25,7 +25,7 @@ SINGLE_BATTLE_TEST("Electric Terrain activates Electric Seed and Mimicry")
ASSUME(gItemsInfo[ITEM_ELECTRIC_SEED].holdEffect == HOLD_EFFECT_SEEDS);
ASSUME(gItemsInfo[ITEM_ELECTRIC_SEED].holdEffectParam == HOLD_EFFECT_PARAM_ELECTRIC_TERRAIN);
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_ELECTRIC_SEED); }
OPPONENT(SPECIES_STUNFISK_GALARIAN) { Ability(ABILITY_MIMICRY); }
OPPONENT(SPECIES_STUNFISK_GALAR) { Ability(ABILITY_MIMICRY); }
} WHEN {
TURN { MOVE(player, MOVE_ELECTRIC_TERRAIN); }
} SCENE {

2
test/battle/terrain/grassy.c
View File

@ -21,7 +21,7 @@ SINGLE_BATTLE_TEST("Grassy Terrain activates Grassy Seed and Mimicry")
ASSUME(gItemsInfo[ITEM_GRASSY_SEED].holdEffect == HOLD_EFFECT_SEEDS);
ASSUME(gItemsInfo[ITEM_GRASSY_SEED].holdEffectParam == HOLD_EFFECT_PARAM_GRASSY_TERRAIN);
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_GRASSY_SEED); }
OPPONENT(SPECIES_STUNFISK_GALARIAN) { Ability(ABILITY_MIMICRY); }
OPPONENT(SPECIES_STUNFISK_GALAR) { Ability(ABILITY_MIMICRY); }
} WHEN {
TURN { MOVE(player, MOVE_GRASSY_TERRAIN); }
} SCENE {

2
test/battle/terrain/misty.c
View File

@ -25,7 +25,7 @@ SINGLE_BATTLE_TEST("Misty Terrain activates Misty Seed and Mimicry")
ASSUME(gItemsInfo[ITEM_MISTY_SEED].holdEffect == HOLD_EFFECT_SEEDS);
ASSUME(gItemsInfo[ITEM_MISTY_SEED].holdEffectParam == HOLD_EFFECT_PARAM_MISTY_TERRAIN);
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_MISTY_SEED); }
OPPONENT(SPECIES_STUNFISK_GALARIAN) { Ability(ABILITY_MIMICRY); }
OPPONENT(SPECIES_STUNFISK_GALAR) { Ability(ABILITY_MIMICRY); }
} WHEN {
TURN { MOVE(player, MOVE_MISTY_TERRAIN); }
} SCENE {

2
test/battle/terrain/psychic.c
View File

@ -24,7 +24,7 @@ SINGLE_BATTLE_TEST("Psychic Terrain activates Psychic Seed and Mimicry")
ASSUME(gItemsInfo[ITEM_PSYCHIC_SEED].holdEffect == HOLD_EFFECT_SEEDS);
ASSUME(gItemsInfo[ITEM_PSYCHIC_SEED].holdEffectParam == HOLD_EFFECT_PARAM_PSYCHIC_TERRAIN);
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_PSYCHIC_SEED); }
OPPONENT(SPECIES_STUNFISK_GALARIAN) { Ability(ABILITY_MIMICRY); }
OPPONENT(SPECIES_STUNFISK_GALAR) { Ability(ABILITY_MIMICRY); }
} WHEN {
TURN { MOVE(player, MOVE_PSYCHIC_TERRAIN); }
} SCENE {