Legends Arceus Pokemon 95% Finished

This commit is contained in:
Blackforest92 2022-07-03 17:15:37 +07:00
parent ade935f6cf
commit 8c88e8a9b7
54 changed files with 2851 additions and 235 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 427 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 484 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 410 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 480 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 563 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 462 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 503 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

View File

@ -911,11 +911,18 @@ enum {
NATIONAL_DEX_GLASTRIER,
NATIONAL_DEX_SPECTRIER,
NATIONAL_DEX_CALYREX,
NATIONAL_DEX_WYRDEER,
NATIONAL_DEX_KLEAVOR,
NATIONAL_DEX_URSALUNA,
NATIONAL_DEX_BASCULEGION,
NATIONAL_DEX_SNEASLER,
NATIONAL_DEX_OVERQWIL,
NATIONAL_DEX_ENAMORUS,
};
#define KANTO_DEX_COUNT NATIONAL_DEX_MEW
#define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI
#define NATIONAL_DEX_COUNT NATIONAL_DEX_CALYREX
#define NATIONAL_DEX_COUNT NATIONAL_DEX_ENAMORUS
#define POKEMON_SLOTS_NUMBER (NATIONAL_DEX_COUNT + 1)
// Hoenn Pokedex order

View File

@ -399,7 +399,8 @@
#define FLAG_ULTRA_BEAST (1 << 2)
#define FLAG_ALOLAN_FORM (1 << 3)
#define FLAG_GALARIAN_FORM (1 << 4)
#define FLAG_GENDER_DIFFERENCE (1 << 5)
#define FLAG_HISUIAN_FORM (1 << 5)
#define FLAG_GENDER_DIFFERENCE (1 << 6)
#define LEGENDARY_PERFECT_IV_COUNT 3

View File

@ -900,8 +900,15 @@
#define SPECIES_GLASTRIER 896
#define SPECIES_SPECTRIER 897
#define SPECIES_CALYREX 898
#define SPECIES_WYRDEER 899
#define SPECIES_KLEAVOR 900
#define SPECIES_URSALUNA 901
#define SPECIES_BASCULEGION 902
#define SPECIES_SNEASLER 903
#define SPECIES_OVERQWIL 904
#define SPECIES_ENAMORUS 905
#define FORMS_START SPECIES_CALYREX
#define FORMS_START SPECIES_ENAMORUS
// Megas
#define SPECIES_VENUSAUR_MEGA FORMS_START + 1
@ -998,348 +1005,370 @@
#define SPECIES_YAMASK_GALARIAN FORMS_START + 86
#define SPECIES_STUNFISK_GALARIAN FORMS_START + 87
//Hisuian Forms
#define SPECIES_GROWLITHE_HISUIAN FORMS_START + 88
#define SPECIES_ARCANINE_HISUIAN FORMS_START + 89
#define SPECIES_VOLTORB_HISUIAN FORMS_START + 90
#define SPECIES_ELECTRODE_HISUIAN FORMS_START + 91
#define SPECIES_TYPHLOSION_HISUIAN FORMS_START + 92
#define SPECIES_QWILFISH_HISUIAN FORMS_START + 93
#define SPECIES_SNEASEL_HISUIAN FORMS_START + 94
#define SPECIES_SAMUROTT_HISUIAN FORMS_START + 95
#define SPECIES_LILLIGANT_HISUIAN FORMS_START + 96
#define SPECIES_ZORUA_HISUIAN FORMS_START + 97
#define SPECIES_ZOROARK_HISUIAN FORMS_START + 98
#define SPECIES_BRAVIARY_HISUIAN FORMS_START + 99
#define SPECIES_SLIGGOO_HISUIAN FORMS_START + 100
#define SPECIES_GOODRA_HISUIAN FORMS_START + 101
#define SPECIES_AVALUGG_HISUIAN FORMS_START + 102
#define SPECIES_DECIDUEYE_HISUIAN FORMS_START + 103
// Misc Forms
// Cosplay Pikachu
#define SPECIES_PIKACHU_COSPLAY FORMS_START + 88
#define SPECIES_PIKACHU_ROCK_STAR FORMS_START + 89
#define SPECIES_PIKACHU_BELLE FORMS_START + 90
#define SPECIES_PIKACHU_POP_STAR FORMS_START + 91
#define SPECIES_PIKACHU_PH_D FORMS_START + 92
#define SPECIES_PIKACHU_LIBRE FORMS_START + 93
#define SPECIES_PIKACHU_COSPLAY FORMS_START + 104
#define SPECIES_PIKACHU_ROCK_STAR FORMS_START + 105
#define SPECIES_PIKACHU_BELLE FORMS_START + 106
#define SPECIES_PIKACHU_POP_STAR FORMS_START + 107
#define SPECIES_PIKACHU_PH_D FORMS_START + 108
#define SPECIES_PIKACHU_LIBRE FORMS_START + 109
// Cap Pikachu
#define SPECIES_PIKACHU_ORIGINAL_CAP FORMS_START + 94
#define SPECIES_PIKACHU_HOENN_CAP FORMS_START + 95
#define SPECIES_PIKACHU_SINNOH_CAP FORMS_START + 96
#define SPECIES_PIKACHU_UNOVA_CAP FORMS_START + 97
#define SPECIES_PIKACHU_KALOS_CAP FORMS_START + 98
#define SPECIES_PIKACHU_ALOLA_CAP FORMS_START + 99
#define SPECIES_PIKACHU_PARTNER_CAP FORMS_START + 100
#define SPECIES_PIKACHU_WORLD_CAP FORMS_START + 101
#define SPECIES_PIKACHU_ORIGINAL_CAP FORMS_START + 110
#define SPECIES_PIKACHU_HOENN_CAP FORMS_START + 111
#define SPECIES_PIKACHU_SINNOH_CAP FORMS_START + 112
#define SPECIES_PIKACHU_UNOVA_CAP FORMS_START + 113
#define SPECIES_PIKACHU_KALOS_CAP FORMS_START + 114
#define SPECIES_PIKACHU_ALOLA_CAP FORMS_START + 115
#define SPECIES_PIKACHU_PARTNER_CAP FORMS_START + 116
#define SPECIES_PIKACHU_WORLD_CAP FORMS_START + 117
// Pichu
#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 102
#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 118
// Unown
#define SPECIES_UNOWN_B FORMS_START + 103
#define SPECIES_UNOWN_C FORMS_START + 104
#define SPECIES_UNOWN_D FORMS_START + 105
#define SPECIES_UNOWN_E FORMS_START + 106
#define SPECIES_UNOWN_F FORMS_START + 107
#define SPECIES_UNOWN_G FORMS_START + 108
#define SPECIES_UNOWN_H FORMS_START + 109
#define SPECIES_UNOWN_I FORMS_START + 110
#define SPECIES_UNOWN_J FORMS_START + 111
#define SPECIES_UNOWN_K FORMS_START + 112
#define SPECIES_UNOWN_L FORMS_START + 113
#define SPECIES_UNOWN_M FORMS_START + 114
#define SPECIES_UNOWN_N FORMS_START + 115
#define SPECIES_UNOWN_O FORMS_START + 116
#define SPECIES_UNOWN_P FORMS_START + 117
#define SPECIES_UNOWN_Q FORMS_START + 118
#define SPECIES_UNOWN_R FORMS_START + 119
#define SPECIES_UNOWN_S FORMS_START + 120
#define SPECIES_UNOWN_T FORMS_START + 121
#define SPECIES_UNOWN_U FORMS_START + 122
#define SPECIES_UNOWN_V FORMS_START + 123
#define SPECIES_UNOWN_W FORMS_START + 124
#define SPECIES_UNOWN_X FORMS_START + 125
#define SPECIES_UNOWN_Y FORMS_START + 126
#define SPECIES_UNOWN_Z FORMS_START + 127
#define SPECIES_UNOWN_EMARK FORMS_START + 128
#define SPECIES_UNOWN_QMARK FORMS_START + 129
#define SPECIES_UNOWN_B FORMS_START + 119
#define SPECIES_UNOWN_C FORMS_START + 120
#define SPECIES_UNOWN_D FORMS_START + 121
#define SPECIES_UNOWN_E FORMS_START + 122
#define SPECIES_UNOWN_F FORMS_START + 123
#define SPECIES_UNOWN_G FORMS_START + 124
#define SPECIES_UNOWN_H FORMS_START + 125
#define SPECIES_UNOWN_I FORMS_START + 126
#define SPECIES_UNOWN_J FORMS_START + 127
#define SPECIES_UNOWN_K FORMS_START + 128
#define SPECIES_UNOWN_L FORMS_START + 129
#define SPECIES_UNOWN_M FORMS_START + 130
#define SPECIES_UNOWN_N FORMS_START + 131
#define SPECIES_UNOWN_O FORMS_START + 132
#define SPECIES_UNOWN_P FORMS_START + 133
#define SPECIES_UNOWN_Q FORMS_START + 134
#define SPECIES_UNOWN_R FORMS_START + 135
#define SPECIES_UNOWN_S FORMS_START + 136
#define SPECIES_UNOWN_T FORMS_START + 137
#define SPECIES_UNOWN_U FORMS_START + 138
#define SPECIES_UNOWN_V FORMS_START + 139
#define SPECIES_UNOWN_W FORMS_START + 140
#define SPECIES_UNOWN_X FORMS_START + 141
#define SPECIES_UNOWN_Y FORMS_START + 142
#define SPECIES_UNOWN_Z FORMS_START + 143
#define SPECIES_UNOWN_EMARK FORMS_START + 144
#define SPECIES_UNOWN_QMARK FORMS_START + 145
// Castform
#define SPECIES_CASTFORM_SUNNY FORMS_START + 130
#define SPECIES_CASTFORM_RAINY FORMS_START + 131
#define SPECIES_CASTFORM_SNOWY FORMS_START + 132
#define SPECIES_CASTFORM_SUNNY FORMS_START + 146
#define SPECIES_CASTFORM_RAINY FORMS_START + 147
#define SPECIES_CASTFORM_SNOWY FORMS_START + 148
// Deoxys
#define SPECIES_DEOXYS_ATTACK FORMS_START + 133
#define SPECIES_DEOXYS_DEFENSE FORMS_START + 134
#define SPECIES_DEOXYS_SPEED FORMS_START + 135
#define SPECIES_DEOXYS_ATTACK FORMS_START + 149
#define SPECIES_DEOXYS_DEFENSE FORMS_START + 150
#define SPECIES_DEOXYS_SPEED FORMS_START + 151
// Burmy
#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 136
#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 137
#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 152
#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 153
// Wormadam
#define SPECIES_WORMADAM_SANDY_CLOAK FORMS_START + 138
#define SPECIES_WORMADAM_TRASH_CLOAK FORMS_START + 139
#define SPECIES_WORMADAM_SANDY_CLOAK FORMS_START + 154
#define SPECIES_WORMADAM_TRASH_CLOAK FORMS_START + 155
// Cherrim
#define SPECIES_CHERRIM_SUNSHINE FORMS_START + 140
#define SPECIES_CHERRIM_SUNSHINE FORMS_START + 156
// Shellos
#define SPECIES_SHELLOS_EAST_SEA FORMS_START + 141
#define SPECIES_SHELLOS_EAST_SEA FORMS_START + 157
// Gastrodon
#define SPECIES_GASTRODON_EAST_SEA FORMS_START + 142
#define SPECIES_GASTRODON_EAST_SEA FORMS_START + 158
// Rotom
#define SPECIES_ROTOM_HEAT FORMS_START + 143
#define SPECIES_ROTOM_WASH FORMS_START + 144
#define SPECIES_ROTOM_FROST FORMS_START + 145
#define SPECIES_ROTOM_FAN FORMS_START + 146
#define SPECIES_ROTOM_MOW FORMS_START + 147
#define SPECIES_ROTOM_HEAT FORMS_START + 159
#define SPECIES_ROTOM_WASH FORMS_START + 160
#define SPECIES_ROTOM_FROST FORMS_START + 161
#define SPECIES_ROTOM_FAN FORMS_START + 162
#define SPECIES_ROTOM_MOW FORMS_START + 163
// Giratina
#define SPECIES_GIRATINA_ORIGIN FORMS_START + 148
// Origin Forme
#define SPECIES_DIALGA_ORIGIN FORMS_START + 164
#define SPECIES_PALKIA_ORIGIN FORMS_START + 165
#define SPECIES_GIRATINA_ORIGIN FORMS_START + 166
// Shaymin
#define SPECIES_SHAYMIN_SKY FORMS_START + 149
#define SPECIES_SHAYMIN_SKY FORMS_START + 167
// Arceus
#define SPECIES_ARCEUS_FIGHTING FORMS_START + 150
#define SPECIES_ARCEUS_FLYING FORMS_START + 151
#define SPECIES_ARCEUS_POISON FORMS_START + 152
#define SPECIES_ARCEUS_GROUND FORMS_START + 153
#define SPECIES_ARCEUS_ROCK FORMS_START + 154
#define SPECIES_ARCEUS_BUG FORMS_START + 155
#define SPECIES_ARCEUS_GHOST FORMS_START + 156
#define SPECIES_ARCEUS_STEEL FORMS_START + 157
#define SPECIES_ARCEUS_FIRE FORMS_START + 158
#define SPECIES_ARCEUS_WATER FORMS_START + 159
#define SPECIES_ARCEUS_GRASS FORMS_START + 160
#define SPECIES_ARCEUS_ELECTRIC FORMS_START + 161
#define SPECIES_ARCEUS_PSYCHIC FORMS_START + 162
#define SPECIES_ARCEUS_ICE FORMS_START + 163
#define SPECIES_ARCEUS_DRAGON FORMS_START + 164
#define SPECIES_ARCEUS_DARK FORMS_START + 165
#define SPECIES_ARCEUS_FAIRY FORMS_START + 166
#define SPECIES_ARCEUS_FIGHTING FORMS_START + 168
#define SPECIES_ARCEUS_FLYING FORMS_START + 169
#define SPECIES_ARCEUS_POISON FORMS_START + 170
#define SPECIES_ARCEUS_GROUND FORMS_START + 171
#define SPECIES_ARCEUS_ROCK FORMS_START + 172
#define SPECIES_ARCEUS_BUG FORMS_START + 173
#define SPECIES_ARCEUS_GHOST FORMS_START + 174
#define SPECIES_ARCEUS_STEEL FORMS_START + 175
#define SPECIES_ARCEUS_FIRE FORMS_START + 176
#define SPECIES_ARCEUS_WATER FORMS_START + 177
#define SPECIES_ARCEUS_GRASS FORMS_START + 178
#define SPECIES_ARCEUS_ELECTRIC FORMS_START + 179
#define SPECIES_ARCEUS_PSYCHIC FORMS_START + 180
#define SPECIES_ARCEUS_ICE FORMS_START + 181
#define SPECIES_ARCEUS_DRAGON FORMS_START + 182
#define SPECIES_ARCEUS_DARK FORMS_START + 183
#define SPECIES_ARCEUS_FAIRY FORMS_START + 184
// Basculin
#define SPECIES_BASCULIN_BLUE_STRIPED FORMS_START + 167
#define SPECIES_BASCULIN_BLUE_STRIPED FORMS_START + 185
#define SPECIES_BASCULIN_WHITE_STRIPED FORMS_START + 186
// Darmanitan
#define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 168
#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 169
#define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 187
#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 188
// Deerling
#define SPECIES_DEERLING_SUMMER FORMS_START + 170
#define SPECIES_DEERLING_AUTUMN FORMS_START + 171
#define SPECIES_DEERLING_WINTER FORMS_START + 172
#define SPECIES_DEERLING_SUMMER FORMS_START + 189
#define SPECIES_DEERLING_AUTUMN FORMS_START + 190
#define SPECIES_DEERLING_WINTER FORMS_START + 191
// Sawsbuck
#define SPECIES_SAWSBUCK_SUMMER FORMS_START + 173
#define SPECIES_SAWSBUCK_AUTUMN FORMS_START + 174
#define SPECIES_SAWSBUCK_WINTER FORMS_START + 175
#define SPECIES_SAWSBUCK_SUMMER FORMS_START + 192
#define SPECIES_SAWSBUCK_AUTUMN FORMS_START + 193
#define SPECIES_SAWSBUCK_WINTER FORMS_START + 194
// Therian Forms
#define SPECIES_TORNADUS_THERIAN FORMS_START + 176
#define SPECIES_THUNDURUS_THERIAN FORMS_START + 177
#define SPECIES_LANDORUS_THERIAN FORMS_START + 178
#define SPECIES_TORNADUS_THERIAN FORMS_START + 195
#define SPECIES_THUNDURUS_THERIAN FORMS_START + 196
#define SPECIES_LANDORUS_THERIAN FORMS_START + 197
#define SPECIES_ENAMORUS_THERIAN FORMS_START + 198
// Kyurem
#define SPECIES_KYUREM_WHITE FORMS_START + 179
#define SPECIES_KYUREM_BLACK FORMS_START + 180
#define SPECIES_KYUREM_WHITE FORMS_START + 199
#define SPECIES_KYUREM_BLACK FORMS_START + 200
// Keldeo
#define SPECIES_KELDEO_RESOLUTE FORMS_START + 181
#define SPECIES_KELDEO_RESOLUTE FORMS_START + 201
// Meloetta
#define SPECIES_MELOETTA_PIROUETTE FORMS_START + 182
#define SPECIES_MELOETTA_PIROUETTE FORMS_START + 202
// Genesect
#define SPECIES_GENESECT_DOUSE_DRIVE FORMS_START + 183
#define SPECIES_GENESECT_SHOCK_DRIVE FORMS_START + 184
#define SPECIES_GENESECT_BURN_DRIVE FORMS_START + 185
#define SPECIES_GENESECT_CHILL_DRIVE FORMS_START + 186
#define SPECIES_GENESECT_DOUSE_DRIVE FORMS_START + 203
#define SPECIES_GENESECT_SHOCK_DRIVE FORMS_START + 204
#define SPECIES_GENESECT_BURN_DRIVE FORMS_START + 205
#define SPECIES_GENESECT_CHILL_DRIVE FORMS_START + 206
// Greninja
#define SPECIES_GRENINJA_BATTLE_BOND FORMS_START + 187
#define SPECIES_GRENINJA_ASH FORMS_START + 188
#define SPECIES_GRENINJA_BATTLE_BOND FORMS_START + 207
#define SPECIES_GRENINJA_ASH FORMS_START + 208
// Vivillon
#define SPECIES_VIVILLON_POLAR FORMS_START + 189
#define SPECIES_VIVILLON_TUNDRA FORMS_START + 190
#define SPECIES_VIVILLON_CONTINENTAL FORMS_START + 191
#define SPECIES_VIVILLON_GARDEN FORMS_START + 192
#define SPECIES_VIVILLON_ELEGANT FORMS_START + 193
#define SPECIES_VIVILLON_MEADOW FORMS_START + 194
#define SPECIES_VIVILLON_MODERN FORMS_START + 195
#define SPECIES_VIVILLON_MARINE FORMS_START + 196
#define SPECIES_VIVILLON_ARCHIPELAGO FORMS_START + 197
#define SPECIES_VIVILLON_HIGH_PLAINS FORMS_START + 198
#define SPECIES_VIVILLON_SANDSTORM FORMS_START + 199
#define SPECIES_VIVILLON_RIVER FORMS_START + 200
#define SPECIES_VIVILLON_MONSOON FORMS_START + 201
#define SPECIES_VIVILLON_SAVANNA FORMS_START + 202
#define SPECIES_VIVILLON_SUN FORMS_START + 203
#define SPECIES_VIVILLON_OCEAN FORMS_START + 204
#define SPECIES_VIVILLON_JUNGLE FORMS_START + 205
#define SPECIES_VIVILLON_FANCY FORMS_START + 206
#define SPECIES_VIVILLON_POKE_BALL FORMS_START + 207
#define SPECIES_VIVILLON_POLAR FORMS_START + 209
#define SPECIES_VIVILLON_TUNDRA FORMS_START + 210
#define SPECIES_VIVILLON_CONTINENTAL FORMS_START + 211
#define SPECIES_VIVILLON_GARDEN FORMS_START + 212
#define SPECIES_VIVILLON_ELEGANT FORMS_START + 213
#define SPECIES_VIVILLON_MEADOW FORMS_START + 214
#define SPECIES_VIVILLON_MODERN FORMS_START + 215
#define SPECIES_VIVILLON_MARINE FORMS_START + 216
#define SPECIES_VIVILLON_ARCHIPELAGO FORMS_START + 217
#define SPECIES_VIVILLON_HIGH_PLAINS FORMS_START + 218
#define SPECIES_VIVILLON_SANDSTORM FORMS_START + 219
#define SPECIES_VIVILLON_RIVER FORMS_START + 220
#define SPECIES_VIVILLON_MONSOON FORMS_START + 221
#define SPECIES_VIVILLON_SAVANNA FORMS_START + 222
#define SPECIES_VIVILLON_SUN FORMS_START + 223
#define SPECIES_VIVILLON_OCEAN FORMS_START + 224
#define SPECIES_VIVILLON_JUNGLE FORMS_START + 225
#define SPECIES_VIVILLON_FANCY FORMS_START + 226
#define SPECIES_VIVILLON_POKE_BALL FORMS_START + 227
// Flabébé
#define SPECIES_FLABEBE_YELLOW_FLOWER FORMS_START + 208
#define SPECIES_FLABEBE_ORANGE_FLOWER FORMS_START + 209
#define SPECIES_FLABEBE_BLUE_FLOWER FORMS_START + 210
#define SPECIES_FLABEBE_WHITE_FLOWER FORMS_START + 211
#define SPECIES_FLABEBE_YELLOW_FLOWER FORMS_START + 228
#define SPECIES_FLABEBE_ORANGE_FLOWER FORMS_START + 229
#define SPECIES_FLABEBE_BLUE_FLOWER FORMS_START + 230
#define SPECIES_FLABEBE_WHITE_FLOWER FORMS_START + 231
// Floette
#define SPECIES_FLOETTE_YELLOW_FLOWER FORMS_START + 212
#define SPECIES_FLOETTE_ORANGE_FLOWER FORMS_START + 213
#define SPECIES_FLOETTE_BLUE_FLOWER FORMS_START + 214
#define SPECIES_FLOETTE_WHITE_FLOWER FORMS_START + 215
#define SPECIES_FLOETTE_ETERNAL_FLOWER FORMS_START + 216
#define SPECIES_FLOETTE_YELLOW_FLOWER FORMS_START + 232
#define SPECIES_FLOETTE_ORANGE_FLOWER FORMS_START + 233
#define SPECIES_FLOETTE_BLUE_FLOWER FORMS_START + 234
#define SPECIES_FLOETTE_WHITE_FLOWER FORMS_START + 235
#define SPECIES_FLOETTE_ETERNAL_FLOWER FORMS_START + 236
// Florges
#define SPECIES_FLORGES_YELLOW_FLOWER FORMS_START + 217
#define SPECIES_FLORGES_ORANGE_FLOWER FORMS_START + 218
#define SPECIES_FLORGES_BLUE_FLOWER FORMS_START + 219
#define SPECIES_FLORGES_WHITE_FLOWER FORMS_START + 220
#define SPECIES_FLORGES_YELLOW_FLOWER FORMS_START + 237
#define SPECIES_FLORGES_ORANGE_FLOWER FORMS_START + 238
#define SPECIES_FLORGES_BLUE_FLOWER FORMS_START + 239
#define SPECIES_FLORGES_WHITE_FLOWER FORMS_START + 240
// Furfrou
#define SPECIES_FURFROU_HEART_TRIM FORMS_START + 221
#define SPECIES_FURFROU_STAR_TRIM FORMS_START + 222
#define SPECIES_FURFROU_DIAMOND_TRIM FORMS_START + 223
#define SPECIES_FURFROU_DEBUTANTE_TRIM FORMS_START + 224
#define SPECIES_FURFROU_MATRON_TRIM FORMS_START + 225
#define SPECIES_FURFROU_DANDY_TRIM FORMS_START + 226
#define SPECIES_FURFROU_LA_REINE_TRIM FORMS_START + 227
#define SPECIES_FURFROU_KABUKI_TRIM FORMS_START + 228
#define SPECIES_FURFROU_PHARAOH_TRIM FORMS_START + 229
#define SPECIES_FURFROU_HEART_TRIM FORMS_START + 241
#define SPECIES_FURFROU_STAR_TRIM FORMS_START + 242
#define SPECIES_FURFROU_DIAMOND_TRIM FORMS_START + 243
#define SPECIES_FURFROU_DEBUTANTE_TRIM FORMS_START + 244
#define SPECIES_FURFROU_MATRON_TRIM FORMS_START + 245
#define SPECIES_FURFROU_DANDY_TRIM FORMS_START + 246
#define SPECIES_FURFROU_LA_REINE_TRIM FORMS_START + 247
#define SPECIES_FURFROU_KABUKI_TRIM FORMS_START + 248
#define SPECIES_FURFROU_PHARAOH_TRIM FORMS_START + 249
// Meowstic
#define SPECIES_MEOWSTIC_FEMALE FORMS_START + 230
#define SPECIES_MEOWSTIC_FEMALE FORMS_START + 250
// Aegislash
#define SPECIES_AEGISLASH_BLADE FORMS_START + 231
#define SPECIES_AEGISLASH_BLADE FORMS_START + 251
// Pumpkaboo
#define SPECIES_PUMPKABOO_SMALL FORMS_START + 232
#define SPECIES_PUMPKABOO_LARGE FORMS_START + 233
#define SPECIES_PUMPKABOO_SUPER FORMS_START + 234
#define SPECIES_PUMPKABOO_SMALL FORMS_START + 252
#define SPECIES_PUMPKABOO_LARGE FORMS_START + 253
#define SPECIES_PUMPKABOO_SUPER FORMS_START + 254
// Gourgeist
#define SPECIES_GOURGEIST_SMALL FORMS_START + 235
#define SPECIES_GOURGEIST_LARGE FORMS_START + 236
#define SPECIES_GOURGEIST_SUPER FORMS_START + 237
#define SPECIES_GOURGEIST_SMALL FORMS_START + 255
#define SPECIES_GOURGEIST_LARGE FORMS_START + 256
#define SPECIES_GOURGEIST_SUPER FORMS_START + 257
// Xerneas
#define SPECIES_XERNEAS_ACTIVE FORMS_START + 238
#define SPECIES_XERNEAS_ACTIVE FORMS_START + 258
// Zygarde
#define SPECIES_ZYGARDE_10 FORMS_START + 239
#define SPECIES_ZYGARDE_10_POWER_CONSTRUCT FORMS_START + 240
#define SPECIES_ZYGARDE_50_POWER_CONSTRUCT FORMS_START + 241
#define SPECIES_ZYGARDE_COMPLETE FORMS_START + 242
#define SPECIES_ZYGARDE_10 FORMS_START + 259
#define SPECIES_ZYGARDE_10_POWER_CONSTRUCT FORMS_START + 260
#define SPECIES_ZYGARDE_50_POWER_CONSTRUCT FORMS_START + 261
#define SPECIES_ZYGARDE_COMPLETE FORMS_START + 262
// Hoopa
#define SPECIES_HOOPA_UNBOUND FORMS_START + 243
#define SPECIES_HOOPA_UNBOUND FORMS_START + 263
// Oricorio
#define SPECIES_ORICORIO_POM_POM FORMS_START + 244
#define SPECIES_ORICORIO_PAU FORMS_START + 245
#define SPECIES_ORICORIO_SENSU FORMS_START + 246
#define SPECIES_ORICORIO_POM_POM FORMS_START + 264
#define SPECIES_ORICORIO_PAU FORMS_START + 265
#define SPECIES_ORICORIO_SENSU FORMS_START + 266
// Rockruff
#define SPECIES_ROCKRUFF_OWN_TEMPO FORMS_START + 247
#define SPECIES_ROCKRUFF_OWN_TEMPO FORMS_START + 267
// Lycanroc
#define SPECIES_LYCANROC_MIDNIGHT FORMS_START + 248
#define SPECIES_LYCANROC_DUSK FORMS_START + 249
#define SPECIES_LYCANROC_MIDNIGHT FORMS_START + 268
#define SPECIES_LYCANROC_DUSK FORMS_START + 269
// Wishiwashi
#define SPECIES_WISHIWASHI_SCHOOL FORMS_START + 250
#define SPECIES_WISHIWASHI_SCHOOL FORMS_START + 270
// Silvally
#define SPECIES_SILVALLY_FIGHTING FORMS_START + 251
#define SPECIES_SILVALLY_FLYING FORMS_START + 252
#define SPECIES_SILVALLY_POISON FORMS_START + 253
#define SPECIES_SILVALLY_GROUND FORMS_START + 254
#define SPECIES_SILVALLY_ROCK FORMS_START + 255
#define SPECIES_SILVALLY_BUG FORMS_START + 256
#define SPECIES_SILVALLY_GHOST FORMS_START + 257
#define SPECIES_SILVALLY_STEEL FORMS_START + 258
#define SPECIES_SILVALLY_FIRE FORMS_START + 259
#define SPECIES_SILVALLY_WATER FORMS_START + 260
#define SPECIES_SILVALLY_GRASS FORMS_START + 261
#define SPECIES_SILVALLY_ELECTRIC FORMS_START + 262
#define SPECIES_SILVALLY_PSYCHIC FORMS_START + 263
#define SPECIES_SILVALLY_ICE FORMS_START + 264
#define SPECIES_SILVALLY_DRAGON FORMS_START + 265
#define SPECIES_SILVALLY_DARK FORMS_START + 266
#define SPECIES_SILVALLY_FAIRY FORMS_START + 267
#define SPECIES_SILVALLY_FIGHTING FORMS_START + 271
#define SPECIES_SILVALLY_FLYING FORMS_START + 272
#define SPECIES_SILVALLY_POISON FORMS_START + 273
#define SPECIES_SILVALLY_GROUND FORMS_START + 274
#define SPECIES_SILVALLY_ROCK FORMS_START + 275
#define SPECIES_SILVALLY_BUG FORMS_START + 276
#define SPECIES_SILVALLY_GHOST FORMS_START + 277
#define SPECIES_SILVALLY_STEEL FORMS_START + 278
#define SPECIES_SILVALLY_FIRE FORMS_START + 279
#define SPECIES_SILVALLY_WATER FORMS_START + 280
#define SPECIES_SILVALLY_GRASS FORMS_START + 281
#define SPECIES_SILVALLY_ELECTRIC FORMS_START + 282
#define SPECIES_SILVALLY_PSYCHIC FORMS_START + 283
#define SPECIES_SILVALLY_ICE FORMS_START + 284
#define SPECIES_SILVALLY_DRAGON FORMS_START + 285
#define SPECIES_SILVALLY_DARK FORMS_START + 286
#define SPECIES_SILVALLY_FAIRY FORMS_START + 287
// Minior
#define SPECIES_MINIOR_METEOR_ORANGE FORMS_START + 268
#define SPECIES_MINIOR_METEOR_YELLOW FORMS_START + 269
#define SPECIES_MINIOR_METEOR_GREEN FORMS_START + 270
#define SPECIES_MINIOR_METEOR_BLUE FORMS_START + 271
#define SPECIES_MINIOR_METEOR_INDIGO FORMS_START + 272
#define SPECIES_MINIOR_METEOR_VIOLET FORMS_START + 273
#define SPECIES_MINIOR_CORE_RED FORMS_START + 274
#define SPECIES_MINIOR_CORE_ORANGE FORMS_START + 275
#define SPECIES_MINIOR_CORE_YELLOW FORMS_START + 276
#define SPECIES_MINIOR_CORE_GREEN FORMS_START + 277
#define SPECIES_MINIOR_CORE_BLUE FORMS_START + 278
#define SPECIES_MINIOR_CORE_INDIGO FORMS_START + 279
#define SPECIES_MINIOR_CORE_VIOLET FORMS_START + 280
#define SPECIES_MINIOR_METEOR_ORANGE FORMS_START + 288
#define SPECIES_MINIOR_METEOR_YELLOW FORMS_START + 289
#define SPECIES_MINIOR_METEOR_GREEN FORMS_START + 290
#define SPECIES_MINIOR_METEOR_BLUE FORMS_START + 291
#define SPECIES_MINIOR_METEOR_INDIGO FORMS_START + 292
#define SPECIES_MINIOR_METEOR_VIOLET FORMS_START + 293
#define SPECIES_MINIOR_CORE_RED FORMS_START + 294
#define SPECIES_MINIOR_CORE_ORANGE FORMS_START + 295
#define SPECIES_MINIOR_CORE_YELLOW FORMS_START + 296
#define SPECIES_MINIOR_CORE_GREEN FORMS_START + 297
#define SPECIES_MINIOR_CORE_BLUE FORMS_START + 298
#define SPECIES_MINIOR_CORE_INDIGO FORMS_START + 299
#define SPECIES_MINIOR_CORE_VIOLET FORMS_START + 300
// Mimikyu
#define SPECIES_MIMIKYU_BUSTED FORMS_START + 281
#define SPECIES_MIMIKYU_BUSTED FORMS_START + 301
// Necrozma
#define SPECIES_NECROZMA_DUSK_MANE FORMS_START + 282
#define SPECIES_NECROZMA_DAWN_WINGS FORMS_START + 283
#define SPECIES_NECROZMA_ULTRA FORMS_START + 284
#define SPECIES_NECROZMA_DUSK_MANE FORMS_START + 302
#define SPECIES_NECROZMA_DAWN_WINGS FORMS_START + 303
#define SPECIES_NECROZMA_ULTRA FORMS_START + 304
// Magearna
#define SPECIES_MAGEARNA_ORIGINAL_COLOR FORMS_START + 285
#define SPECIES_MAGEARNA_ORIGINAL_COLOR FORMS_START + 305
// Cramorant
#define SPECIES_CRAMORANT_GULPING FORMS_START + 286
#define SPECIES_CRAMORANT_GORGING FORMS_START + 287
#define SPECIES_CRAMORANT_GULPING FORMS_START + 306
#define SPECIES_CRAMORANT_GORGING FORMS_START + 307
// Toxtricity
#define SPECIES_TOXTRICITY_LOW_KEY FORMS_START + 288
#define SPECIES_TOXTRICITY_LOW_KEY FORMS_START + 308
// Sinistea
#define SPECIES_SINISTEA_ANTIQUE FORMS_START + 289
#define SPECIES_SINISTEA_ANTIQUE FORMS_START + 309
// Polteageist
#define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 290
#define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 310
// Alcremie
#define SPECIES_ALCREMIE_RUBY_CREAM FORMS_START + 291
#define SPECIES_ALCREMIE_MATCHA_CREAM FORMS_START + 292
#define SPECIES_ALCREMIE_MINT_CREAM FORMS_START + 293
#define SPECIES_ALCREMIE_LEMON_CREAM FORMS_START + 294
#define SPECIES_ALCREMIE_SALTED_CREAM FORMS_START + 295
#define SPECIES_ALCREMIE_RUBY_SWIRL FORMS_START + 296
#define SPECIES_ALCREMIE_CARAMEL_SWIRL FORMS_START + 297
#define SPECIES_ALCREMIE_RAINBOW_SWIRL FORMS_START + 298
#define SPECIES_ALCREMIE_RUBY_CREAM FORMS_START + 311
#define SPECIES_ALCREMIE_MATCHA_CREAM FORMS_START + 312
#define SPECIES_ALCREMIE_MINT_CREAM FORMS_START + 313
#define SPECIES_ALCREMIE_LEMON_CREAM FORMS_START + 314
#define SPECIES_ALCREMIE_SALTED_CREAM FORMS_START + 315
#define SPECIES_ALCREMIE_RUBY_SWIRL FORMS_START + 316
#define SPECIES_ALCREMIE_CARAMEL_SWIRL FORMS_START + 317
#define SPECIES_ALCREMIE_RAINBOW_SWIRL FORMS_START + 318
// Eiscue
#define SPECIES_EISCUE_NOICE_FACE FORMS_START + 299
#define SPECIES_EISCUE_NOICE_FACE FORMS_START + 319
// Indeedee
#define SPECIES_INDEEDEE_FEMALE FORMS_START + 300
#define SPECIES_INDEEDEE_FEMALE FORMS_START + 320
// Morpeko
#define SPECIES_MORPEKO_HANGRY FORMS_START + 301
#define SPECIES_MORPEKO_HANGRY FORMS_START + 321
// Zacian
#define SPECIES_ZACIAN_CROWNED_SWORD FORMS_START + 302
#define SPECIES_ZACIAN_CROWNED_SWORD FORMS_START + 322
// Zamazenta
#define SPECIES_ZAMAZENTA_CROWNED_SHIELD FORMS_START + 303
#define SPECIES_ZAMAZENTA_CROWNED_SHIELD FORMS_START + 323
// Eternatus
#define SPECIES_ETERNATUS_ETERNAMAX FORMS_START + 304
#define SPECIES_ETERNATUS_ETERNAMAX FORMS_START + 324
// Urshifu
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE FORMS_START + 305
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE FORMS_START + 325
// Zarude
#define SPECIES_ZARUDE_DADA FORMS_START + 306
#define SPECIES_ZARUDE_DADA FORMS_START + 326
// Calyrex
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 307
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 308
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328
#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1
#define NUM_SPECIES SPECIES_EGG

View File

@ -949,6 +949,14 @@ extern const u32 gMonFrontPic_Regidrago[];
extern const u32 gMonFrontPic_Glastrier[];
extern const u32 gMonFrontPic_Spectrier[];
extern const u32 gMonFrontPic_Calyrex[];
//extern const u32 gMonFrontPic_Wyrdeer[];
//extern const u32 gMonFrontPic_Kleavor[];
//extern const u32 gMonFrontPic_Ursaluna[];
//extern const u32 gMonFrontPic_Basculegion[];
//extern const u32 gMonFrontPic_BasculegionF[];
//extern const u32 gMonFrontPic_Sneasler[];
//extern const u32 gMonFrontPic_Overqwil[];
//extern const u32 gMonFrontPic_Enamorus[];
extern const u32 gMonFrontPic_VenusaurMega[];
extern const u32 gMonFrontPic_CharizardMegaX[];
extern const u32 gMonFrontPic_CharizardMegaY[];
@ -1036,6 +1044,22 @@ extern const u32 gMonFrontPic_DarumakaGalarian[];
extern const u32 gMonFrontPic_DarmanitanGalarian[];
extern const u32 gMonFrontPic_YamaskGalarian[];
extern const u32 gMonFrontPic_StunfiskGalarian[];
//extern const u32 gMonFrontPic_GrowlitheHisuian[];
//extern const u32 gMonFrontPic_ArcanineHisuian[];
//extern const u32 gMonFrontPic_VoltorbHisuian[];
//extern const u32 gMonFrontPic_ElectrodeHisuian[];
//extern const u32 gMonFrontPic_TyphlosionHisuian[];
//extern const u32 gMonFrontPic_QwilfishHisuian[];
//extern const u32 gMonFrontPic_SneaselHisuian[];
//extern const u32 gMonFrontPic_SamurottHisuian[];
//extern const u32 gMonFrontPic_LilligantHisuian[];
//extern const u32 gMonFrontPic_ZoruaHisuian[];
//extern const u32 gMonFrontPic_ZoroarkHisuian[];
//extern const u32 gMonFrontPic_BraviaryHisuian[];
//extern const u32 gMonFrontPic_SliggooHisuian[];
//extern const u32 gMonFrontPic_GoodraHisuian[];
//extern const u32 gMonFrontPic_AvaluggHisuian[];
//extern const u32 gMonFrontPic_DecidueyeHisuian[];
extern const u32 gMonFrontPic_PikachuCosplay[];
extern const u32 gMonFrontPic_PikachuRockStar[];
extern const u32 gMonFrontPic_PikachuBelle[];
@ -1096,9 +1120,12 @@ extern const u32 gMonFrontPic_RotomWash[];
extern const u32 gMonFrontPic_RotomFrost[];
extern const u32 gMonFrontPic_RotomFan[];
extern const u32 gMonFrontPic_RotomMow[];
//extern const u32 gMonFrontPic_DialgaOrigin[];
//extern const u32 gMonFrontPic_PalkiaOrigin[];
extern const u32 gMonFrontPic_GiratinaOrigin[];
extern const u32 gMonFrontPic_ShayminSky[];
extern const u32 gMonFrontPic_BasculinBlueStriped[];
//extern const u32 gMonFrontPic_BasculinWhiteStriped[];
extern const u32 gMonFrontPic_DarmanitanZenMode[];
extern const u32 gMonFrontPic_DarmanitanZenModeGalarian[];
extern const u32 gMonFrontPic_SawsbuckSummer[];
@ -1107,6 +1134,7 @@ extern const u32 gMonFrontPic_SawsbuckWinter[];
extern const u32 gMonFrontPic_TornadusTherian[];
extern const u32 gMonFrontPic_ThundurusTherian[];
extern const u32 gMonFrontPic_LandorusTherian[];
//extern const u32 gMonFrontPic_EnamorusTherian[];
extern const u32 gMonFrontPic_KyuremWhite[];
extern const u32 gMonFrontPic_KyuremBlack[];
extern const u32 gMonFrontPic_KeldeoResolute[];
@ -2101,6 +2129,14 @@ extern const u32 gMonBackPic_Regidrago[];
extern const u32 gMonBackPic_Glastrier[];
extern const u32 gMonBackPic_Spectrier[];
extern const u32 gMonBackPic_Calyrex[];
//extern const u32 gMonBackPic_Wyrdeer[];
//extern const u32 gMonBackPic_Kleavor[];
//extern const u32 gMonBackPic_Ursaluna[];
//extern const u32 gMonBackPic_Basculegion[];
//extern const u32 gMonBackPic_BasculegionF[];
//extern const u32 gMonBackPic_Sneasler[];
//extern const u32 gMonBackPic_Overqwil[];
//extern const u32 gMonBackPic_Enamorus[];
extern const u32 gMonBackPic_VenusaurMega[];
extern const u32 gMonBackPic_CharizardMegaX[];
extern const u32 gMonBackPic_CharizardMegaY[];
@ -2188,6 +2224,22 @@ extern const u32 gMonBackPic_DarumakaGalarian[];
extern const u32 gMonBackPic_DarmanitanGalarian[];
extern const u32 gMonBackPic_YamaskGalarian[];
extern const u32 gMonBackPic_StunfiskGalarian[];
//extern const u32 gMonBackPic_GrowlitheHisuian[];
//extern const u32 gMonBackPic_ArcanineHisuian[];
//extern const u32 gMonBackPic_VoltorbHisuian[];
//extern const u32 gMonBackPic_ElectrodeHisuian[];
//extern const u32 gMonBackPic_TyphlosionHisuian[];
//extern const u32 gMonBackPic_QwilfishHisuian[];
//extern const u32 gMonBackPic_SneaselHisuian[];
//extern const u32 gMonBackPic_SamurottHisuian[];
//extern const u32 gMonBackPic_LilligantHisuian[];
//extern const u32 gMonBackPic_ZoruaHisuian[];
//extern const u32 gMonBackPic_ZoroarkHisuian[];
//extern const u32 gMonBackPic_BraviaryHisuian[];
//extern const u32 gMonBackPic_SliggooHisuian[];
//extern const u32 gMonBackPic_GoodraHisuian[];
//extern const u32 gMonBackPic_AvaluggHisuian[];
//extern const u32 gMonBackPic_DecidueyeHisuian[];
extern const u32 gMonBackPic_PikachuCosplay[];
extern const u32 gMonBackPic_PikachuRockStar[];
extern const u32 gMonBackPic_PikachuBelle[];
@ -2248,9 +2300,12 @@ extern const u32 gMonBackPic_RotomWash[];
extern const u32 gMonBackPic_RotomFrost[];
extern const u32 gMonBackPic_RotomFan[];
extern const u32 gMonBackPic_RotomMow[];
//extern const u32 gMonBackPic_DialgaOrigin[];
//extern const u32 gMonBackPic_PalkiaOrigin[];
extern const u32 gMonBackPic_GiratinaOrigin[];
extern const u32 gMonBackPic_ShayminSky[];
extern const u32 gMonBackPic_BasculinBlueStriped[];
//extern const u32 gMonBackPic_BasculinWhiteStriped[];
extern const u32 gMonBackPic_DarmanitanZenMode[];
extern const u32 gMonBackPic_DarmanitanZenModeGalarian[];
extern const u32 gMonBackPic_SawsbuckSummer[];
@ -2259,6 +2314,7 @@ extern const u32 gMonBackPic_SawsbuckWinter[];
extern const u32 gMonBackPic_TornadusTherian[];
extern const u32 gMonBackPic_ThundurusTherian[];
extern const u32 gMonBackPic_LandorusTherian[];
//extern const u32 gMonBackPic_EnamorusTherian[];
extern const u32 gMonBackPic_KyuremWhite[];
extern const u32 gMonBackPic_KyuremBlack[];
extern const u32 gMonBackPic_KeldeoResolute[];
@ -3245,6 +3301,14 @@ extern const u32 gMonPalette_Regidrago[];
extern const u32 gMonPalette_Glastrier[];
extern const u32 gMonPalette_Spectrier[];
extern const u32 gMonPalette_Calyrex[];
//extern const u32 gMonPalette_Wyrdeer[];
//extern const u32 gMonPalette_Kleavor[];
//extern const u32 gMonPalette_Ursaluna[];
//extern const u32 gMonPalette_Basculegion[];
//extern const u32 gMonPalette_BasculegionF[];
//extern const u32 gMonPalette_Sneasler[];
//extern const u32 gMonPalette_Overqwil[];
//extern const u32 gMonPalette_Enamorus[];
extern const u32 gMonPalette_VenusaurMega[];
extern const u32 gMonPalette_CharizardMegaX[];
extern const u32 gMonPalette_CharizardMegaY[];
@ -3332,6 +3396,22 @@ extern const u32 gMonPalette_DarumakaGalarian[];
extern const u32 gMonPalette_DarmanitanGalarian[];
extern const u32 gMonPalette_YamaskGalarian[];
extern const u32 gMonPalette_StunfiskGalarian[];
//extern const u32 gMonPalette_GrowlitheHisuian[];
//extern const u32 gMonPalette_ArcanineHisuian[];
//extern const u32 gMonPalette_VoltorbHisuian[];
//extern const u32 gMonPalette_ElectrodeHisuian[];
//extern const u32 gMonPalette_TyphlosionHisuian[];
//extern const u32 gMonPalette_QwilfishHisuian[];
//extern const u32 gMonPalette_SneaselHisuian[];
//extern const u32 gMonPalette_SamurottHisuian[];
//extern const u32 gMonPalette_LilligantHisuian[];
//extern const u32 gMonPalette_ZoruaHisuian[];
//extern const u32 gMonPalette_ZoroarkHisuian[];
//extern const u32 gMonPalette_BraviaryHisuian[];
//extern const u32 gMonPalette_SliggooHisuian[];
//extern const u32 gMonPalette_GoodraHisuian[];
//extern const u32 gMonPalette_AvaluggHisuian[];
//extern const u32 gMonPalette_DecidueyeHisuian[];
extern const u32 gMonPalette_PikachuCosplay[];
extern const u32 gMonPalette_PikachuRockStar[];
extern const u32 gMonPalette_PikachuBelle[];
@ -3365,6 +3445,8 @@ extern const u32 gMonPalette_RotomWash[];
extern const u32 gMonPalette_RotomFrost[];
extern const u32 gMonPalette_RotomFan[];
extern const u32 gMonPalette_RotomMow[];
//extern const u32 gMonPalette_DialgaOrigin[];
//extern const u32 gMonPalette_PalkiaOrigin[];
extern const u32 gMonPalette_GiratinaOrigin[];
extern const u32 gMonPalette_ShayminSky[];
extern const u32 gMonPalette_ArceusFighting[];
@ -3385,6 +3467,7 @@ extern const u32 gMonPalette_ArceusDragon[];
extern const u32 gMonPalette_ArceusDark[];
extern const u32 gMonPalette_ArceusFairy[];
extern const u32 gMonPalette_BasculinBlueStriped[];
//extern const u32 gMonPalette_BasculinWhiteStriped[];
extern const u32 gMonPalette_DarmanitanZenMode[];
extern const u32 gMonPalette_DarmanitanZenModeGalarian[];
extern const u32 gMonPalette_DeerlingSummer[];
@ -3396,6 +3479,7 @@ extern const u32 gMonPalette_SawsbuckWinter[];
extern const u32 gMonPalette_TornadusTherian[];
extern const u32 gMonPalette_ThundurusTherian[];
extern const u32 gMonPalette_LandorusTherian[];
//extern const u32 gMonPalette_EnamorusTherian[];
extern const u32 gMonPalette_KyuremWhite[];
extern const u32 gMonPalette_KyuremBlack[];
extern const u32 gMonPalette_KeldeoResolute[];
@ -4417,6 +4501,14 @@ extern const u32 gMonShinyPalette_Regidrago[];
extern const u32 gMonShinyPalette_Glastrier[];
extern const u32 gMonShinyPalette_Spectrier[];
extern const u32 gMonShinyPalette_Calyrex[];
//extern const u32 gMonShinyPalette_Wyrdeer[];
//extern const u32 gMonShinyPalette_Kleavor[];
//extern const u32 gMonShinyPalette_Ursaluna[];
//extern const u32 gMonShinyPalette_Basculegion[];
//extern const u32 gMonShinyPalette_BasculegionF[];
//extern const u32 gMonShinyPalette_Sneasler[];
//extern const u32 gMonShinyPalette_Overqwil[];
//extern const u32 gMonShinyPalette_Enamorus[];
extern const u32 gMonShinyPalette_VenusaurMega[];
extern const u32 gMonShinyPalette_CharizardMegaX[];
extern const u32 gMonShinyPalette_CharizardMegaY[];
@ -4504,6 +4596,22 @@ extern const u32 gMonShinyPalette_DarumakaGalarian[];
extern const u32 gMonShinyPalette_DarmanitanGalarian[];
extern const u32 gMonShinyPalette_YamaskGalarian[];
extern const u32 gMonShinyPalette_StunfiskGalarian[];
//extern const u32 gMonShinyPalette_GrowlitheHisuian[];
//extern const u32 gMonShinyPalette_ArcanineHisuian[];
//extern const u32 gMonShinyPalette_VoltorbHisuian[];
//extern const u32 gMonShinyPalette_ElectrodeHisuian[];
//extern const u32 gMonShinyPalette_TyphlosionHisuian[];
//extern const u32 gMonShinyPalette_QwilfishHisuian[];
//extern const u32 gMonShinyPalette_SneaselHisuian[];
//extern const u32 gMonShinyPalette_SamurottHisuian[];
//extern const u32 gMonShinyPalette_LilligantHisuian[];
//extern const u32 gMonShinyPalette_ZoruaHisuian[];
//extern const u32 gMonShinyPalette_ZoroarkHisuian[];
//extern const u32 gMonShinyPalette_BraviaryHisuian[];
//extern const u32 gMonShinyPalette_SliggooHisuian[];
//extern const u32 gMonShinyPalette_GoodraHisuian[];
//extern const u32 gMonShinyPalette_AvaluggHisuian[];
//extern const u32 gMonShinyPalette_DecidueyeHisuian[];
extern const u32 gMonShinyPalette_PikachuCosplay[];
extern const u32 gMonShinyPalette_PikachuRockStar[];
extern const u32 gMonShinyPalette_PikachuBelle[];
@ -4537,6 +4645,8 @@ extern const u32 gMonShinyPalette_RotomWash[];
extern const u32 gMonShinyPalette_RotomFrost[];
extern const u32 gMonShinyPalette_RotomFan[];
extern const u32 gMonShinyPalette_RotomMow[];
//extern const u32 gMonShinyPalette_DialgaOrigin[];
//extern const u32 gMonShinyPalette_PalkiaOrigin[];
extern const u32 gMonShinyPalette_GiratinaOrigin[];
extern const u32 gMonShinyPalette_ShayminSky[];
extern const u32 gMonShinyPalette_ArceusFighting[];
@ -4557,6 +4667,7 @@ extern const u32 gMonShinyPalette_ArceusDragon[];
extern const u32 gMonShinyPalette_ArceusDark[];
extern const u32 gMonShinyPalette_ArceusFairy[];
extern const u32 gMonShinyPalette_BasculinBlueStriped[];
//extern const u32 gMonShinyPalette_BasculinWhiteStriped[];
extern const u32 gMonShinyPalette_DarmanitanZenMode[];
extern const u32 gMonShinyPalette_DarmanitanZenModeGalarian[];
extern const u32 gMonShinyPalette_DeerlingSummer[];
@ -4568,6 +4679,7 @@ extern const u32 gMonShinyPalette_SawsbuckWinter[];
extern const u32 gMonShinyPalette_TornadusTherian[];
extern const u32 gMonShinyPalette_ThundurusTherian[];
extern const u32 gMonShinyPalette_LandorusTherian[];
//extern const u32 gMonShinyPalette_EnamorusTherian[];
extern const u32 gMonShinyPalette_KyuremWhite[];
extern const u32 gMonShinyPalette_KyuremBlack[];
extern const u32 gMonShinyPalette_KeldeoResolute[];
@ -5577,7 +5689,15 @@ extern const u8 gMonIcon_Regieleki[];
extern const u8 gMonIcon_Regidrago[];
extern const u8 gMonIcon_Glastrier[];
extern const u8 gMonIcon_Spectrier[];
//extern const u8 gMonIcon_Calyrex[];
extern const u8 gMonIcon_Calyrex[];
extern const u8 gMonIcon_Wyrdeer[];
extern const u8 gMonIcon_Kleavor[];
extern const u8 gMonIcon_Ursaluna[];
extern const u8 gMonIcon_Basculegion[];
extern const u8 gMonIcon_BasculegionF[];
extern const u8 gMonIcon_Sneasler[];
extern const u8 gMonIcon_Overqwil[];
extern const u8 gMonIcon_Enamorus[];
extern const u8 gMonIcon_VenusaurMega[];
extern const u8 gMonIcon_CharizardMegaX[];
extern const u8 gMonIcon_CharizardMegaY[];
@ -5665,6 +5785,22 @@ extern const u8 gMonIcon_DarumakaGalarian[];
extern const u8 gMonIcon_DarmanitanGalarian[];
extern const u8 gMonIcon_YamaskGalarian[];
extern const u8 gMonIcon_StunfiskGalarian[];
extern const u8 gMonIcon_GrowlitheHisuian[];
extern const u8 gMonIcon_ArcanineHisuian[];
extern const u8 gMonIcon_VoltorbHisuian[];
extern const u8 gMonIcon_ElectrodeHisuian[];
extern const u8 gMonIcon_TyphlosionHisuian[];
extern const u8 gMonIcon_QwilfishHisuian[];
extern const u8 gMonIcon_SneaselHisuian[];
extern const u8 gMonIcon_SamurottHisuian[];
extern const u8 gMonIcon_LilligantHisuian[];
extern const u8 gMonIcon_ZoruaHisuian[];
extern const u8 gMonIcon_ZoroarkHisuian[];
extern const u8 gMonIcon_BraviaryHisuian[];
extern const u8 gMonIcon_SliggooHisuian[];
extern const u8 gMonIcon_GoodraHisuian[];
extern const u8 gMonIcon_AvaluggHisuian[];
extern const u8 gMonIcon_DecidueyeHisuian[];
extern const u8 gMonIcon_PikachuCosplay[];
extern const u8 gMonIcon_PikachuRockStar[];
extern const u8 gMonIcon_PikachuBelle[];
@ -5724,9 +5860,12 @@ extern const u8 gMonIcon_RotomWash[];
extern const u8 gMonIcon_RotomFrost[];
extern const u8 gMonIcon_RotomFan[];
extern const u8 gMonIcon_RotomMow[];
extern const u8 gMonIcon_DialgaOrigin[];
extern const u8 gMonIcon_PalkiaOrigin[];
extern const u8 gMonIcon_GiratinaOrigin[];
extern const u8 gMonIcon_ShayminSky[];
extern const u8 gMonIcon_BasculinBlueStriped[];
extern const u8 gMonIcon_BasculinWhiteStriped[];
extern const u8 gMonIcon_DarmanitanZenMode[];
extern const u8 gMonIcon_DarmanitanZenModeGalarian[];
extern const u8 gMonIcon_DeerlingSummer[];
@ -5738,6 +5877,7 @@ extern const u8 gMonIcon_SawsbuckWinter[];
extern const u8 gMonIcon_TornadusTherian[];
extern const u8 gMonIcon_ThundurusTherian[];
extern const u8 gMonIcon_LandorusTherian[];
extern const u8 gMonIcon_EnamorusTherian[];
extern const u8 gMonIcon_KyuremWhite[];
extern const u8 gMonIcon_KyuremBlack[];
extern const u8 gMonIcon_KeldeoResolute[];
@ -6729,6 +6869,13 @@ extern const u8 gMonFootprint_Regidrago[];
extern const u8 gMonFootprint_Glastrier[];
extern const u8 gMonFootprint_Spectrier[];
extern const u8 gMonFootprint_Calyrex[];
//extern const u8 gMonFootprint_Wyrdeer[];
//extern const u8 gMonFootprint_Kleavor[];
//extern const u8 gMonFootprint_Ursaluna[];
//extern const u8 gMonFootprint_Basculegion[];
//extern const u8 gMonFootprint_Sneasler[];
//extern const u8 gMonFootprint_Overqwil[];
//extern const u8 gMonFootprint_Enamorus[];
// trainer sprites
extern const u32 gTrainerFrontPic_Hiker[];

View File

@ -898,6 +898,13 @@ gCryTable::
cry Cry_Glastrier
cry Cry_Spectrier
cry Cry_Calyrex
cry Cry_Bulbasaur //Cry_Wyrdeer
cry Cry_Bulbasaur //Cry_Kleavor
cry Cry_Bulbasaur //Cry_Ursaluna
cry Cry_Bulbasaur //Cry_Basculegion
cry Cry_Bulbasaur //Cry_Sneasler
cry Cry_Bulbasaur //Cry_Overqwil
cry Cry_Bulbasaur //Cry_Enamorus
@ Megas
cry Cry_VenusaurMega
cry Cry_CharizardMegaX
@ -989,6 +996,23 @@ gCryTable::
cry Cry_Darmanitan
cry Cry_Yamask
cry Cry_Stunfisk
@ Hisuian Forms
cry Cry_Growlithe
cry Cry_Arcanine
cry Cry_Voltorb
cry Cry_Electrode
cry Cry_Typhlosion
cry Cry_Qwilfish
cry Cry_Sneasel
cry Cry_Samurott
cry Cry_Lilligant
cry Cry_Zorua
cry Cry_Zoroark
cry Cry_Braviary
cry Cry_Sliggoo
cry Cry_Goodra
cry Cry_Avalugg
cry Cry_Decidueye
@ Misc Forms
@ Cosplay Pikachu
cry Cry_Pikachu
@ -1062,7 +1086,9 @@ gCryTable::
cry Cry_Rotom
cry Cry_Rotom
cry Cry_Rotom
@ Giratina
@ Origin Forme
cry Cry_Dialga
cry Cry_Palkia
cry Cry_Giratina
@ Shaymin
cry Cry_ShayminSky
@ -1086,6 +1112,7 @@ gCryTable::
cry Cry_Arceus
@ Basculin
cry Cry_Basculin
cry Cry_Basculin
@ Darmanitan
cry Cry_Darmanitan
cry Cry_Darmanitan
@ -2172,6 +2199,13 @@ gCryTable_Reverse::
cry_reverse Cry_Glastrier
cry_reverse Cry_Spectrier
cry_reverse Cry_Calyrex
cry_reverse Cry_Bulbasaur //Cry_Wyrdeer
cry_reverse Cry_Bulbasaur //Cry_Kleavor
cry_reverse Cry_Bulbasaur //Cry_Ursaluna
cry_reverse Cry_Bulbasaur //Cry_Basculegion
cry_reverse Cry_Bulbasaur //Cry_Sneasler
cry_reverse Cry_Bulbasaur //Cry_Overqwil
cry_reverse Cry_Bulbasaur //Cry_Enamorus
@ Megas
cry_reverse Cry_VenusaurMega
cry_reverse Cry_CharizardMegaX
@ -2263,6 +2297,23 @@ gCryTable_Reverse::
cry_reverse Cry_Darmanitan
cry_reverse Cry_Yamask
cry_reverse Cry_Stunfisk
@ Hisuian Forms
cry_reverse Cry_Growlithe
cry_reverse Cry_Arcanine
cry_reverse Cry_Voltorb
cry_reverse Cry_Electrode
cry_reverse Cry_Typhlosion
cry_reverse Cry_Qwilfish
cry_reverse Cry_Sneasel
cry_reverse Cry_Samurott
cry_reverse Cry_Lilligant
cry_reverse Cry_Zorua
cry_reverse Cry_Zoroark
cry_reverse Cry_Braviary
cry_reverse Cry_Sliggoo
cry_reverse Cry_Goodra
cry_reverse Cry_Avalugg
cry_reverse Cry_Decidueye
@ Misc Forms
@ Cosplay Pikachu
cry_reverse Cry_Pikachu
@ -2336,7 +2387,9 @@ gCryTable_Reverse::
cry_reverse Cry_Rotom
cry_reverse Cry_Rotom
cry_reverse Cry_Rotom
@ Giratina
@ Origin Forme
cry_reverse Cry_Dialga
cry_reverse Cry_Palkia
cry_reverse Cry_Giratina
@ Shaymin
cry_reverse Cry_ShayminSky
@ -2360,6 +2413,7 @@ gCryTable_Reverse::
cry_reverse Cry_Arceus
@ Basculin
cry_reverse Cry_Basculin
cry_reverse Cry_Basculin
@ Darmanitan
cry_reverse Cry_Darmanitan
cry_reverse Cry_Darmanitan
@ -2375,6 +2429,7 @@ gCryTable_Reverse::
cry_reverse Cry_TornadusTherian
cry_reverse Cry_ThundurusTherian
cry_reverse Cry_LandorusTherian
cry_reverse Cry_Bulbasaur //Cry_EnamorusTherian
@ Kyurem
cry_reverse Cry_KyuremWhite
cry_reverse Cry_KyuremBlack

View File

@ -3977,6 +3977,35 @@ Cry_Spectrier::
.align 2
Cry_Calyrex::
.incbin "sound/direct_sound_samples/cries/calyrex.bin"
/*
.align 2
Cry_Wyrdeer::
.incbin "sound/direct_sound_samples/cries/wyrdeer.bin"
.align 2
Cry_Kleavor::
.incbin "sound/direct_sound_samples/cries/kleavor.bin"
.align 2
Cry_Ursaluna::
.incbin "sound/direct_sound_samples/cries/ursaluna.bin"
.align 2
Cry_Basculegion::
.incbin "sound/direct_sound_samples/cries/basculegion.bin"
.align 2
Cry_Sneasler::
.incbin "sound/direct_sound_samples/cries/sneasler.bin"
.align 2
Cry_Overqwil::
.incbin "sound/direct_sound_samples/cries/overqwil.bin"
.align 2
Cry_Enamorus::
.incbin "sound/direct_sound_samples/cries/enamorus.bin"
*/
.align 2
Cry_VenusaurMega::
@ -4197,6 +4226,11 @@ Cry_ThundurusTherian::
.align 2
Cry_LandorusTherian::
.incbin "sound/direct_sound_samples/cries/landorus_therian.bin"
/*
.align 2
Cry_EnamorusTherian::
.incbin "sound/direct_sound_samples/cries/enamorus_therian.bin"
*/
.align 2
Cry_KyuremWhite::

View File

@ -912,6 +912,14 @@ const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/fron
const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz");
const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz");
const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz");
//const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz");
//const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz");
//const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz");
//const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz");
//const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/frontf.4bpp.lz");
//const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz");
//const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz");
//const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz");
const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/front.4bpp.lz");
const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/front.4bpp.lz");
const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/front.4bpp.lz");
@ -999,6 +1007,22 @@ const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumak
const u32 gMonFrontPic_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/front.4bpp.lz");
const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz");
const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/front.4bpp.lz");
//const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_VoltorbHisuian[]] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_ElectrodeHisuian[]] = INCBIN_U32("graphics/pokemon/electrode/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_TyphlosionHisuian[]] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_QwilfishHisuian[]] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_SneaselHisuian[]] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_SamurottHisuian[]] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_LilligantHisuian[]] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_ZoruaHisuian[]] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_ZoroarkHisuian[]] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_BraviaryHisuian[]] = INCBIN_U32("graphics/pokemon/braviary/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_SliggooHisuian[]] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_GoodraHisuian[]] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_AvaluggHisuian[]] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz");
//const u32 gMonFrontPic_DecidueyeHisuian[]] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/front.4bpp.lz");
const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/front.4bpp.lz");
const u32 gMonFrontPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/front.4bpp.lz");
@ -1059,9 +1083,12 @@ const u32 gMonFrontPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/ani
const u32 gMonFrontPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/anim_front.4bpp.lz");
const u32 gMonFrontPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/anim_front.4bpp.lz");
const u32 gMonFrontPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/anim_front.4bpp.lz");
//const u32 gMonFrontPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/front.4bpp.lz");
//const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/front.4bpp.lz");
const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/anim_front.4bpp.lz");
const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/anim_front.4bpp.lz");
const u32 gMonFrontPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/front.4bpp.lz");
//const u32 gMonFrontPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/front.4bpp.lz");
const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/anim_front.4bpp.lz");
const u32 gMonFrontPic_DarmanitanZenModeGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/front.4bpp.lz");
const u32 gMonFrontPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/front.4bpp.lz");
@ -1070,6 +1097,7 @@ const u32 gMonFrontPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/
const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/anim_front.4bpp.lz");
const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/anim_front.4bpp.lz");
const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/anim_front.4bpp.lz");
//const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz");
const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/anim_front.4bpp.lz");
const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/anim_front.4bpp.lz");
const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/front.4bpp.lz");
@ -2064,6 +2092,14 @@ const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.
const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz");
const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz");
const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz");
//const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz");
//const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz");
//const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz");
//const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz");
//const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/backf.4bpp.lz");
//const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz");
//const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz");
//const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz");
const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/back.4bpp.lz");
const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/back.4bpp.lz");
const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/back.4bpp.lz");
@ -2151,6 +2187,22 @@ const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka
const u32 gMonBackPic_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/back.4bpp.lz");
const u32 gMonBackPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/back.4bpp.lz");
const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/back.4bpp.lz");
//const u32 gMonBackPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_VoltorbHisuian[]] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_ElectrodeHisuian[]] = INCBIN_U32("graphics/pokemon/electrode/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_TyphlosionHisuian[]] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_QwilfishHisuian[]] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_SneaselHisuian[]] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_SamurottHisuian[]] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_LilligantHisuian[]] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_ZoruaHisuian[]] = INCBIN_U32("graphics/pokemon/zorua/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_ZoroarkHisuian[]] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_BraviaryHisuian[]] = INCBIN_U32("graphics/pokemon/braviary/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_SliggooHisuian[]] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_GoodraHisuian[]] = INCBIN_U32("graphics/pokemon/goodra/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_AvaluggHisuian[]] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/back.4bpp.lz");
//const u32 gMonBackPic_DecidueyeHisuian[]] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz");
const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/back.4bpp.lz");
const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/back.4bpp.lz");
const u32 gMonBackPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/back.4bpp.lz");
@ -2211,9 +2263,12 @@ const u32 gMonBackPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/back
const u32 gMonBackPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/back.4bpp.lz");
const u32 gMonBackPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/back.4bpp.lz");
const u32 gMonBackPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/back.4bpp.lz");
//const u32 gMonBackPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/back.4bpp.lz");
//const u32 gMonBackPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/back.4bpp.lz");
const u32 gMonBackPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/back.4bpp.lz");
const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/back.4bpp.lz");
const u32 gMonBackPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/back.4bpp.lz");
//const u32 gMonBackPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/back.4bpp.lz");
const u32 gMonBackPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/back.4bpp.lz");
const u32 gMonBackPic_DarmanitanZenModeGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/back.4bpp.lz");
const u32 gMonBackPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/back.4bpp.lz");
@ -2222,6 +2277,7 @@ const u32 gMonBackPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/w
const u32 gMonBackPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/back.4bpp.lz");
const u32 gMonBackPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/back.4bpp.lz");
const u32 gMonBackPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/back.4bpp.lz");
//const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz");
const u32 gMonBackPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/back.4bpp.lz");
const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/back.4bpp.lz");
const u32 gMonBackPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/back.4bpp.lz");
@ -3208,6 +3264,14 @@ const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/norma
const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz");
const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz");
const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz");
//const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz");
//const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz");
//const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz");
//const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz");
//const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/normalf.gbapal.lz");
//const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz");
//const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz");
//const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz");
const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/normal.gbapal.lz");
const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/normal.gbapal.lz");
const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/normal.gbapal.lz");
@ -3295,6 +3359,22 @@ const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka
const u32 gMonPalette_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/normal.gbapal.lz");
const u32 gMonPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/normal.gbapal.lz");
const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/normal.gbapal.lz");
//const u32 gMonPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_VoltorbHisuian[]] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_ElectrodeHisuian[]] = INCBIN_U32("graphics/pokemon/electrode/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_TyphlosionHisuian[]] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_QwilfishHisuian[]] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_SneaselHisuian[]] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_SamurottHisuian[]] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_LilligantHisuian[]] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_ZoruaHisuian[]] = INCBIN_U32("graphics/pokemon/zorua/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_ZoroarkHisuian[]] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_BraviaryHisuian[]] = INCBIN_U32("graphics/pokemon/braviary/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_SliggooHisuian[]] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_GoodraHisuian[]] = INCBIN_U32("graphics/pokemon/goodra/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_AvaluggHisuian[]] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/normal.gbapal.lz");
//const u32 gMonPalette_DecidueyeHisuian[]] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz");
const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/normal.gbapal.lz");
const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/normal.gbapal.lz");
const u32 gMonPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/normal.gbapal.lz");
@ -3328,6 +3408,8 @@ const u32 gMonPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/norm
const u32 gMonPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/normal.gbapal.lz");
const u32 gMonPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/normal.gbapal.lz");
const u32 gMonPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/normal.gbapal.lz");
//const u32 gMonPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/normal.gbapal.lz");
//const u32 gMonPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/normal.gbapal.lz");
const u32 gMonPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/normal.gbapal.lz");
const u32 gMonPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/normal.gbapal.lz");
const u32 gMonPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/normal.gbapal.lz");
@ -3348,6 +3430,7 @@ const u32 gMonPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/drago
const u32 gMonPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/normal.gbapal.lz");
const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/normal.gbapal.lz");
const u32 gMonPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/normal.gbapal.lz");
//const u32 gMonPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/normal.gbapal.lz");
const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/normal.gbapal.lz");
const u32 gMonPalette_DarmanitanZenModeGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/normal.gbapal.lz");
const u32 gMonPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/normal.gbapal.lz");
@ -3359,6 +3442,7 @@ const u32 gMonPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/w
const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/normal.gbapal.lz");
const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/normal.gbapal.lz");
const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/normal.gbapal.lz");
//const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz");
const u32 gMonPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/normal.gbapal.lz");
const u32 gMonPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/normal.gbapal.lz");
const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/normal.gbapal.lz");
@ -4379,6 +4463,14 @@ const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/
const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz");
const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz");
const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz");
//const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/shinyf.gbapal.lz");
//const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz");
//const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz");
const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/shiny.gbapal.lz");
const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/shiny.gbapal.lz");
const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/shiny.gbapal.lz");
@ -4466,6 +4558,22 @@ const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/dar
const u32 gMonShinyPalette_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/shiny.gbapal.lz");
const u32 gMonShinyPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/shiny.gbapal.lz");
const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_VoltorbHisuian[]] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_ElectrodeHisuian[]] = INCBIN_U32("graphics/pokemon/electrode/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_TyphlosionHisuian[]] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_QwilfishHisuian[]] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_SneaselHisuian[]] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_SamurottHisuian[]] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_LilligantHisuian[]] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_ZoruaHisuian[]] = INCBIN_U32("graphics/pokemon/zorua/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_ZoroarkHisuian[]] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_BraviaryHisuian[]] = INCBIN_U32("graphics/pokemon/braviary/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_SliggooHisuian[]] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_GoodraHisuian[]] = INCBIN_U32("graphics/pokemon/goodra/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_AvaluggHisuian[]] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_DecidueyeHisuian[]] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/shiny.gbapal.lz");
const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/shiny.gbapal.lz");
const u32 gMonShinyPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/shiny.gbapal.lz");
@ -4499,6 +4607,8 @@ const u32 gMonShinyPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash
const u32 gMonShinyPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/shiny.gbapal.lz");
const u32 gMonShinyPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/shiny.gbapal.lz");
const u32 gMonShinyPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/shiny.gbapal.lz");
//const u32 gMonShinyPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/shiny.gbapal.lz");
//const u32 gMonShinyPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/shiny.gbapal.lz");
const u32 gMonShinyPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/shiny.gbapal.lz");
const u32 gMonShinyPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/shiny.gbapal.lz");
const u32 gMonShinyPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/shiny.gbapal.lz");
@ -4519,6 +4629,7 @@ const u32 gMonShinyPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/
const u32 gMonShinyPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/shiny.gbapal.lz");
const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/shiny.gbapal.lz");
const u32 gMonShinyPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/shiny.gbapal.lz");
//const u32 gMonShinyPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/shiny.gbapal.lz");
const u32 gMonShinyPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/shiny.gbapal.lz");
const u32 gMonShinyPalette_DarmanitanZenModeGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/shiny.gbapal.lz");
const u32 gMonShinyPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/shiny.gbapal.lz");
@ -4530,6 +4641,7 @@ const u32 gMonShinyPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsb
const u32 gMonShinyPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/shiny.gbapal.lz");
const u32 gMonShinyPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/shiny.gbapal.lz");
const u32 gMonShinyPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/shiny.gbapal.lz");
//const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz");
const u32 gMonShinyPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/shiny.gbapal.lz");
const u32 gMonShinyPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/shiny.gbapal.lz");
const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/shiny.gbapal.lz");
@ -5539,7 +5651,15 @@ const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp"
const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp");
const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp");
const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp");
//const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp");
const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp");
const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/icon.4bpp");
const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/icon.4bpp");
const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/icon.4bpp");
const u8 gMonIcon_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp");
const u8 gMonIcon_BasculegionF[] = INCBIN_U8("graphics/pokemon/basculegion/iconf.4bpp");
const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp");
const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp");
const u8 gMonIcon_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp");
const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/mega_venusaur/icon.4bpp");
const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/mega_charizard_x/icon.4bpp");
const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/mega_charizard_y/icon.4bpp");
@ -5627,6 +5747,22 @@ const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/gala
const u8 gMonIcon_DarmanitanGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp");
const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp");
const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/galarian/icon.4bpp");
const u8 gMonIcon_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/growlithe/hisuian/icon.4bpp");
const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/arcanine/hisuian/icon.4bpp");
const u8 gMonIcon_VoltorbHisuian[] = INCBIN_U8("graphics/pokemon/voltorb/hisuian/icon.4bpp");
const u8 gMonIcon_ElectrodeHisuian[] = INCBIN_U8("graphics/pokemon/electrode/hisuian/icon.4bpp");
const u8 gMonIcon_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/typhlosion/hisuian/icon.4bpp");
const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/qwilfish/hisuian/icon.4bpp");
const u8 gMonIcon_SneaselHisuian[] = INCBIN_U8("graphics/pokemon/sneasel/hisuian/icon.4bpp");
const u8 gMonIcon_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/samurott/hisuian/icon.4bpp");
const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/lilligant/hisuian/icon.4bpp");
const u8 gMonIcon_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/zorua/hisuian/icon.4bpp");
const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/zoroark/hisuian/icon.4bpp");
const u8 gMonIcon_BraviaryHisuian[] = INCBIN_U8("graphics/pokemon/braviary/hisuian/icon.4bpp");
const u8 gMonIcon_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/sliggoo/hisuian/icon.4bpp");
const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/goodra/hisuian/icon.4bpp");
const u8 gMonIcon_AvaluggHisuian[] = INCBIN_U8("graphics/pokemon/avalugg/hisuian/icon.4bpp");
const u8 gMonIcon_DecidueyeHisuian[] = INCBIN_U8("graphics/pokemon/decidueye/hisuian/icon.4bpp");
const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/pikachu/cosplay/icon.4bpp");
const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/pikachu/rock_star/icon.4bpp");
const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/pikachu/belle/icon.4bpp");
@ -5686,9 +5822,12 @@ const u8 gMonIcon_RotomWash[] = INCBIN_U8("graphics/pokemon/rotom/wash/icon.4bpp
const u8 gMonIcon_RotomFrost[] = INCBIN_U8("graphics/pokemon/rotom/frost/icon.4bpp");
const u8 gMonIcon_RotomFan[] = INCBIN_U8("graphics/pokemon/rotom/fan/icon.4bpp");
const u8 gMonIcon_RotomMow[] = INCBIN_U8("graphics/pokemon/rotom/mow/icon.4bpp");
const u8 gMonIcon_DialgaOrigin[] = INCBIN_U8("graphics/pokemon/dialga/origin/icon.4bpp");
const u8 gMonIcon_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/palkia/origin/icon.4bpp");
const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin/icon.4bpp");
const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4bpp");
const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/basculin/blue_striped/icon.4bpp");
const u8 gMonIcon_BasculinWhiteStriped[] = INCBIN_U8("graphics/pokemon/basculin/white_striped/icon.4bpp");
const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp");
const u8 gMonIcon_DarmanitanZenModeGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp");
const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/deerling/summer/icon.4bpp");
@ -5700,6 +5839,7 @@ const u8 gMonIcon_SawsbuckWinter[] = INCBIN_U8("graphics/pokemon/sawsbuck/winter
const u8 gMonIcon_TornadusTherian[] = INCBIN_U8("graphics/pokemon/tornadus/therian/icon.4bpp");
const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/thundurus/therian/icon.4bpp");
const u8 gMonIcon_LandorusTherian[] = INCBIN_U8("graphics/pokemon/landorus/therian/icon.4bpp");
const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp");
const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/kyurem/white/icon.4bpp");
const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/black/icon.4bpp");
const u8 gMonIcon_KeldeoResolute[] = INCBIN_U8("graphics/pokemon/keldeo/resolute/icon.4bpp");
@ -6691,3 +6831,10 @@ const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/footp
const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/footprint.1bpp");
const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/footprint.1bpp");
const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/footprint.1bpp");
//const u8 gMonFootprint_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/footprint.1bpp");
//const u8 gMonFootprint_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/footprint.1bpp");
//const u8 gMonFootprint_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/footprint.1bpp");
//const u8 gMonFootprint_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/footprint.1bpp");
//const u8 gMonFootprint_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/footprint.1bpp");
//const u8 gMonFootprint_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/footprint.1bpp");
//const u8 gMonFootprint_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/footprint.1bpp");

View File

@ -22837,6 +22837,177 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_LEGENDARY,
},
[SPECIES_WYRDEER] =
{
.baseHP = 103,
.baseAttack = 105,
.baseDefense = 72,
.baseSpeed = 65,
.baseSpAttack = 105,
.baseSpDefense = 75,
.type1 = TYPE_NORMAL,
.type2 = TYPE_PSYCHIC,
.catchRate = 45,
.expYield = 184,
.evYield_Attack = 1,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_INTIMIDATE, ABILITY_FRISK, ABILITY_SAP_SIPPER},
.bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE,
},
[SPECIES_KLEAVOR] =
{
.baseHP = 70,
.baseAttack = 135,
.baseDefense = 95,
.baseSpeed = 85,
.baseSpAttack = 45,
.baseSpDefense = 70,
.type1 = TYPE_BUG,
.type2 = TYPE_ROCK,
.catchRate = 25,
.expYield = 175,
.evYield_Attack = 2,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 25,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG,
.abilities = {ABILITY_SWARM, ABILITY_SHEER_FORCE, ABILITY_STEADFAST},
.bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE,
},
[SPECIES_URSALUNA] =
{
.baseHP = 130,
.baseAttack = 140,
.baseDefense = 105,
.baseSpeed = 50,
.baseSpAttack = 45,
.baseSpDefense = 80,
.type1 = TYPE_GROUND,
.type2 = TYPE_NORMAL,
.catchRate = 75,
.expYield = 194,
.evYield_Attack = 3,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_GUTS, ABILITY_BULLETPROOF, ABILITY_UNNERVE},
.bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE,
},
[SPECIES_BASCULEGION] =
{
.baseHP = 120,
.baseAttack = 112,
.baseDefense = 65,
.baseSpeed = 78,
.baseSpAttack = 80,
.baseSpDefense = 75,
.type1 = TYPE_WATER,
.type2 = TYPE_GHOST,
.catchRate = 25,
.expYield = 186,
.evYield_HP = 2,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_WATER_2,
.eggGroup2 = EGG_GROUP_WATER_2,
.abilities = {ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER},
.bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE,
.flags = FLAG_GENDER_DIFFERENCE,
},
[SPECIES_SNEASLER] =
{
.baseHP = 80,
.baseAttack = 130,
.baseDefense = 60,
.baseSpeed = 120,
.baseSpAttack = 40,
.baseSpDefense = 80,
.type1 = TYPE_FIGHTING,
.type2 = TYPE_POISON,
.catchRate = 135,
.expYield = 179,
.evYield_Attack = 1,
.evYield_Speed = 1,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 35,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_POISON_TOUCH},
.bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE,
},
[SPECIES_OVERQWIL] =
{
.baseHP = 85,
.baseAttack = 115,
.baseDefense = 95,
.baseSpeed = 85,
.baseSpAttack = 65,
.baseSpDefense = 65,
.type1 = TYPE_DARK,
.type2 = TYPE_POISON,
.catchRate = 135,
.expYield = 180,
.evYield_Attack = 1,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_WATER_2,
.eggGroup2 = EGG_GROUP_WATER_2,
.abilities = {ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE},
.bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE,
},
[SPECIES_ENAMORUS] =
{
.baseHP = 74,
.baseAttack = 115,
.baseDefense = 70,
.baseSpeed = 106,
.baseSpAttack = 135,
.baseSpDefense = 80,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FLYING,
.catchRate = 3,
.expYield = 261,
.evYield_SpAttack = 3,
.genderRatio = MON_FEMALE,
.eggCycles = 120,
.friendship = 90,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_HEALER, ABILITY_NONE, ABILITY_CONTRARY},
.bodyColor = BODY_COLOR_PINK,
.noFlip = FALSE,
.flags = FLAG_LEGENDARY,
},
[SPECIES_VENUSAUR_MEGA] =
{
.baseHP = 80,
@ -25022,6 +25193,414 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_GALARIAN_FORM,
},
[SPECIES_GROWLITHE_HISUIAN] =
{
.baseHP = 60,
.baseAttack = 75,
.baseDefense = 45,
.baseSpeed = 55,
.baseSpAttack = 65,
.baseSpDefense = 50,
.type1 = TYPE_FIRE,
.type2 = TYPE_ROCK,
.catchRate = 190,
.expYield = 70,
.evYield_Attack = 1,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_INTIMIDATE, ABILITY_FLASH_FIRE, ABILITY_JUSTIFIED},
.bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_ARCANINE_HISUIAN] =
{
.baseHP = 95,
.baseAttack = 115,
.baseDefense = 80,
.baseSpeed = 90,
.baseSpAttack = 95,
.baseSpDefense = 80,
.type1 = TYPE_FIRE,
.type2 = TYPE_ROCK,
.catchRate = 75,
.expYield = 194,
.evYield_Attack = 2,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_INTIMIDATE, ABILITY_FLASH_FIRE, ABILITY_JUSTIFIED},
.bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_VOLTORB_HISUIAN] =
{
.baseHP = 40,
.baseAttack = 30,
.baseDefense = 50,
.baseSpeed = 100,
.baseSpAttack = 55,
.baseSpDefense = 55,
.type1 = TYPE_ELECTRIC,
.type2 = TYPE_GRASS,
.catchRate = 190,
.expYield = 66,
.evYield_Speed = 1,
.genderRatio = MON_GENDERLESS,
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_MINERAL,
.eggGroup2 = EGG_GROUP_MINERAL,
.abilities = {ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH},
.bodyColor = BODY_COLOR_RED,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_ELECTRODE_HISUIAN] =
{
.baseHP = 60,
.baseAttack = 50,
.baseDefense = 70,
.baseSpAttack = 80,
.baseSpDefense = 80,
.baseSpeed = 150,
.type1 = TYPE_ELECTRIC,
.type2 = TYPE_GRASS,
.catchRate = 60,
.expYield = 172,
.evYield_Speed = 2,
.genderRatio = MON_GENDERLESS,
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_MINERAL,
.eggGroup2 = EGG_GROUP_MINERAL,
.abilities = {ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH},
.bodyColor = BODY_COLOR_RED,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_TYPHLOSION_HISUIAN] =
{
.baseHP = 73,
.baseAttack = 84,
.baseDefense = 78,
.baseSpeed = 95,
.baseSpAttack = 119,
.baseSpDefense = 85,
.type1 = TYPE_FIRE,
.type2 = TYPE_GHOST,
.catchRate = 45,
.expYield = 240,
.evYield_SpAttack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_FLASH_FIRE},
.bodyColor = BODY_COLOR_YELLOW,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_QWILFISH_HISUIAN] =
{
.baseHP = 65,
.baseAttack = 95,
.baseDefense = 85,
.baseSpeed = 85,
.baseSpAttack = 55,
.baseSpDefense = 55,
.type1 = TYPE_DARK,
.type2 = TYPE_POISON,
.catchRate = 45,
.expYield = 88,
.evYield_Attack = 1,
.item2 = ITEM_POISON_BARB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_WATER_2,
.eggGroup2 = EGG_GROUP_WATER_2,
.abilities = {ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE},
.bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_SNEASEL_HISUIAN] =
{
.baseHP = 55,
.baseAttack = 95,
.baseDefense = 55,
.baseSpeed = 115,
.baseSpAttack = 35,
.baseSpDefense = 75,
.type1 = TYPE_POISON,
.type2 = TYPE_FIGHTING,
.catchRate = 60,
.expYield = 86,
.evYield_Speed = 1,
.item2 = ITEM_QUICK_CLAW,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 35,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_POISON_TOUCH},
.bodyColor = BODY_COLOR_BLACK,
.noFlip = TRUE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_SAMUROTT_HISUIAN] =
{
.baseHP = 90,
.baseAttack = 108,
.baseDefense = 80,
.baseSpeed = 85,
.baseSpAttack = 100,
.baseSpDefense = 65,
.type1 = TYPE_WATER,
.type2 = TYPE_DARK,
.catchRate = 45,
.expYield = 238,
.evYield_SpAttack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_SHELL_ARMOR},
.bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_LILLIGANT_HISUIAN] =
{
.baseHP = 70,
.baseAttack = 105,
.baseDefense = 75,
.baseSpeed = 105,
.baseSpAttack = 50,
.baseSpDefense = 75,
.type1 = TYPE_GRASS,
.type2 = TYPE_FIGHTING,
.catchRate = 75,
.expYield = 168,
.evYield_Attack = 2,
#ifdef ITEM_EXPANSION
.item2 = ITEM_ABSORB_BULB,
#endif
.genderRatio = MON_FEMALE,
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_GRASS,
.eggGroup2 = EGG_GROUP_GRASS,
.abilities = {ABILITY_CHLOROPHYLL, ABILITY_HUSTLE, ABILITY_LEAF_GUARD},
.bodyColor = BODY_COLOR_GREEN,
.noFlip = TRUE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_ZORUA_HISUIAN] =
{
.baseHP = 35,
.baseAttack = 60,
.baseDefense = 40,
.baseSpeed = 70,
.baseSpAttack = 85,
.baseSpDefense = 40,
.type1 = TYPE_NORMAL,
.type2 = TYPE_GHOST,
.catchRate = 75,
.expYield = 66,
.evYield_SpAttack = 1,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 25,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_ILLUSION, ABILITY_NONE},
.bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_ZOROARK_HISUIAN] =
{
.baseHP = 55,
.baseAttack = 100,
.baseDefense = 60,
.baseSpeed = 110,
.baseSpAttack = 125,
.baseSpDefense = 60,
.type1 = TYPE_NORMAL,
.type2 = TYPE_GHOST,
.catchRate = 45,
.expYield = 179,
.evYield_SpAttack = 2,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_ILLUSION, ABILITY_NONE},
.bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_BRAVIARY_HISUIAN] =
{
.baseHP = 110,
.baseAttack = 83,
.baseDefense = 70,
.baseSpeed = 65,
.baseSpAttack = 112,
.baseSpDefense = 70,
.type1 = TYPE_PSYCHIC,
.type2 = TYPE_FLYING,
.catchRate = 60,
.expYield = 179,
.evYield_SpAttack = 2,
.genderRatio = MON_MALE,
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_FLYING,
.abilities = {ABILITY_KEEN_EYE, ABILITY_SHEER_FORCE, ABILITY_DEFIANT},
.bodyColor = BODY_COLOR_RED,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_SLIGGOO_HISUIAN] =
{
.baseHP = 58,
.baseAttack = 75,
.baseDefense = 83,
.baseSpeed = 40,
.baseSpAttack = 83,
.baseSpDefense = 113,
.type1 = TYPE_DRAGON,
.type2 = TYPE_STEEL,
.catchRate = 45,
.expYield = 158,
.evYield_SpDefense = 2,
#ifdef ITEM_EXPANSION
.item2 = ITEM_SHED_SHELL,
#endif
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 35,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_DRAGON,
.eggGroup2 = EGG_GROUP_DRAGON,
.abilities = {ABILITY_SAP_SIPPER, ABILITY_OVERCOAT, ABILITY_GOOEY},
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_GOODRA_HISUIAN] =
{
.baseHP = 80,
.baseAttack = 100,
.baseDefense = 100,
.baseSpeed = 60,
.baseSpAttack = 110,
.baseSpDefense = 150,
.type1 = TYPE_DRAGON,
.type2 = TYPE_STEEL,
.catchRate = 45,
.expYield = 270,
.evYield_SpDefense = 3,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 35,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_DRAGON,
.eggGroup2 = EGG_GROUP_DRAGON,
.abilities = {ABILITY_SAP_SIPPER, ABILITY_OVERCOAT, ABILITY_GOOEY},
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_AVALUGG_HISUIAN] =
{
.baseHP = 95,
.baseAttack = 127,
.baseDefense = 184,
.baseSpeed = 38,
.baseSpAttack = 34,
.baseSpDefense = 36,
.type1 = TYPE_ICE,
.type2 = TYPE_ROCK,
.catchRate = 55,
.expYield = 180,
.evYield_Defense = 2,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_MONSTER,
.eggGroup2 = EGG_GROUP_MINERAL,
.abilities = {ABILITY_STRONG_JAW, ABILITY_ICE_BODY, ABILITY_STURDY},
.bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_DECIDUEYE_HISUIAN] =
{
.baseHP = 88,
.baseAttack = 112,
.baseDefense = 80,
.baseSpeed = 60,
.baseSpAttack = 95,
.baseSpDefense = 95,
.type1 = TYPE_GRASS,
.type2 = TYPE_FIGHTING,
.catchRate = 45,
.expYield = 239,
.evYield_Attack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 15,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_FLYING,
.abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_LONG_REACH},
.bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM,
},
[SPECIES_PIKACHU_COSPLAY] = COSPLAY_PIKACHU_BASE_STATS(FLIP),
[SPECIES_PIKACHU_ROCK_STAR] = COSPLAY_PIKACHU_BASE_STATS(FLIP),
[SPECIES_PIKACHU_BELLE] = COSPLAY_PIKACHU_BASE_STATS(NO_FLIP),
@ -25212,6 +25791,56 @@ const struct BaseStats gBaseStats[] =
[SPECIES_ROTOM_FAN] = ROTOM_FORM_BASE_STATS(TYPE_FLYING, FLIP),
[SPECIES_ROTOM_MOW] = ROTOM_FORM_BASE_STATS(TYPE_GRASS, FLIP),
[SPECIES_DIALGA_ORIGIN] =
{
.baseHP = 100,
.baseAttack = 100,
.baseDefense = 120,
.baseSpeed = 90,
.baseSpAttack = 150,
.baseSpDefense = 120,
.type1 = TYPE_STEEL,
.type2 = TYPE_DRAGON,
.catchRate = 3,
.expYield = 306,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
.friendship = 0,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY},
.bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE,
.flags = FLAG_LEGENDARY,
},
[SPECIES_PALKIA_ORIGIN] =
{
.baseHP = 90,
.baseAttack = 100,
.baseDefense = 100,
.baseSpeed = 120,
.baseSpAttack = 150,
.baseSpDefense = 120,
.type1 = TYPE_WATER,
.type2 = TYPE_DRAGON,
.catchRate = 3,
.expYield = 306,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
.friendship = 0,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY},
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = FALSE,
.flags = FLAG_LEGENDARY,
},
[SPECIES_GIRATINA_ORIGIN] =
{
.baseHP = 150,
@ -25305,6 +25934,31 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE,
},
[SPECIES_BASCULIN_WHITE_STRIPED] =
{
.baseHP = 70,
.baseAttack = 92,
.baseDefense = 65,
.baseSpeed = 98,
.baseSpAttack = 80,
.baseSpDefense = 55,
.type1 = TYPE_WATER,
.type2 = TYPE_WATER,
.catchRate = 25,
.expYield = 161,
.evYield_Speed = 2,
.item2 = ITEM_DEEP_SEA_SCALE,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_WATER_2,
.eggGroup2 = EGG_GROUP_WATER_2,
.abilities = {ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER},
.bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE,
},
[SPECIES_DARMANITAN_ZEN_MODE] =
{
.baseHP = 105,
@ -25437,6 +26091,31 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_LEGENDARY,
},
[SPECIES_ENAMORUS_THERIAN] =
{
.baseHP = 74,
.baseAttack = 115,
.baseDefense = 110,
.baseSpeed = 46,
.baseSpAttack = 135,
.baseSpDefense = 100,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FLYING,
.catchRate = 3,
.expYield = 270,
.evYield_SpAttack = 3,
.genderRatio = MON_FEMALE,
.eggCycles = 120,
.friendship = 90,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_OVERCOAT, ABILITY_NONE},
.bodyColor = BODY_COLOR_PINK,
.noFlip = FALSE,
.flags = FLAG_LEGENDARY,
},
[SPECIES_KYUREM_WHITE] =
{
.baseHP = 125,

View File

@ -899,6 +899,13 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_GLASTRIER] = sGlastrierLevelUpLearnset,
[SPECIES_SPECTRIER] = sSpectrierLevelUpLearnset,
[SPECIES_CALYREX] = sCalyrexLevelUpLearnset,
[SPECIES_WYRDEER] = sWyrdeerLevelUpLearnset,
[SPECIES_KLEAVOR] = sKleavorLevelUpLearnset,
[SPECIES_URSALUNA] = sUrsalunaLevelUpLearnset,
[SPECIES_BASCULEGION] = sBasculegionLevelUpLearnset,
[SPECIES_SNEASLER] = sSneaslerLevelUpLearnset,
[SPECIES_OVERQWIL] = sOverqwilLevelUpLearnset,
[SPECIES_ENAMORUS] = sEnamorusLevelUpLearnset,
// Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset,
[SPECIES_CHARIZARD_MEGA_X] = sCharizardLevelUpLearnset,
@ -990,6 +997,23 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianLevelUpLearnset,
[SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset,
[SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianLevelUpLearnset,
// Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianLevelUpLearnset,
[SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianLevelUpLearnset,
[SPECIES_VOLTORB_HISUIAN] = sVoltorbHisuianLevelUpLearnset,
[SPECIES_ELECTRODE_HISUIAN] = sElectrodeHisuianLevelUpLearnset,
[SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianLevelUpLearnset,
[SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianLevelUpLearnset,
[SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianLevelUpLearnset,
[SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianLevelUpLearnset,
[SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianLevelUpLearnset,
[SPECIES_ZORUA_HISUIAN] = sZoruaHisuianLevelUpLearnset,
[SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianLevelUpLearnset,
[SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianLevelUpLearnset,
[SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianLevelUpLearnset,
[SPECIES_GOODRA_HISUIAN] = sGoodraHisuianLevelUpLearnset,
[SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianLevelUpLearnset,
[SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset,
// Misc Forms
// Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset,
@ -1063,7 +1087,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_ROTOM_FROST] = sRotomLevelUpLearnset,
[SPECIES_ROTOM_FAN] = sRotomLevelUpLearnset,
[SPECIES_ROTOM_MOW] = sRotomLevelUpLearnset,
// Giratina
// Origin Forme
[SPECIES_DIALGA_ORIGIN] = sDialgaLevelUpLearnset,
[SPECIES_PALKIA_ORIGIN] = sPalkiaLevelUpLearnset,
[SPECIES_GIRATINA_ORIGIN] = sGiratinaLevelUpLearnset,
// Shaymin
[SPECIES_SHAYMIN_SKY] = sShayminSkyLevelUpLearnset,
@ -1087,6 +1113,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_ARCEUS_FAIRY] = sArceusLevelUpLearnset,
// Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinLevelUpLearnset,
[SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset,
// Darmanitan
[SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanLevelUpLearnset,
[SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanGalarianLevelUpLearnset,
@ -1102,6 +1129,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_TORNADUS_THERIAN] = sTornadusLevelUpLearnset,
[SPECIES_THUNDURUS_THERIAN] = sThundurusLevelUpLearnset,
[SPECIES_LANDORUS_THERIAN] = sLandorusLevelUpLearnset,
[SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset,
// Kyurem
[SPECIES_KYUREM_WHITE] = sKyuremWhiteLevelUpLearnset,
[SPECIES_KYUREM_BLACK] = sKyuremBlackLevelUpLearnset,

View File

@ -18087,6 +18087,96 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = {
LEVEL_UP_END
};
static const struct LevelUpMove sWyrdeerLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 5, MOVE_CONFUSION),
LEVEL_UP_MOVE( 9, MOVE_HYPNOSIS),
LEVEL_UP_MOVE(15, MOVE_CALM_MIND),
//LEVEL_UP_MOVE(21, MOVE_PSYSHIELD_BASH),
LEVEL_UP_MOVE(29, MOVE_EXTRASENSORY),
//LEVEL_UP_MOVE(37, MOVE_ZEN_HEADBUTT),
LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE),
LEVEL_UP_END
};
static const struct LevelUpMove sKleavorLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
LEVEL_UP_MOVE( 6, MOVE_SILVER_WIND),
LEVEL_UP_MOVE(11, MOVE_AERIAL_ACE),
LEVEL_UP_MOVE(14, MOVE_DOUBLE_HIT),
//LEVEL_UP_MOVE(14, MOVE_STEALTH_ROCK),
//LEVEL_UP_MOVE(18, MOVE_AIR_SLASH),
LEVEL_UP_MOVE(25, MOVE_SWORDS_DANCE),
//LEVEL_UP_MOVE(29, MOVE_STONE_AXE),
//LEVEL_UP_MOVE(34, MOVE_X_SCISSOR),
//LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT),
LEVEL_UP_END
};
static const struct LevelUpMove sUrsalunaLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
//LEVEL_UP_MOVE( 6, MOVE_BABY_DOLL_EYES),
//LEVEL_UP_MOVE(11, MOVE_BULLDOZE),
LEVEL_UP_MOVE(18, MOVE_SLASH),
//LEVEL_UP_MOVE(25, MOVE_PLAY_ROUGH),
//LEVEL_UP_MOVE(34, MOVE_HIGH_HORSEPOWER),
LEVEL_UP_MOVE(43, MOVE_DOUBLE_EDGE),
//LEVEL_UP_MOVE(47, MOVE_HEADLONG_RUSH),
LEVEL_UP_END
};
static const struct LevelUpMove sBasculegionLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
//LEVEL_UP_MOVE( 6, MOVE_AQUA_JET),
LEVEL_UP_MOVE(11, MOVE_BITE),
LEVEL_UP_MOVE(11, MOVE_HEX),
//LEVEL_UP_MOVE(18, MOVE_ZEN_HEADBUTT),
LEVEL_UP_MOVE(25, MOVE_CRUNCH),
LEVEL_UP_MOVE(25, MOVE_SHADOW_BALL),
//LEVEL_UP_MOVE(34, MOVE_WAVE_CRASH),
LEVEL_UP_MOVE(43, MOVE_DOUBLE_EDGE),
LEVEL_UP_END
};
static const struct LevelUpMove sSneaslerLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH),
//LEVEL_UP_MOVE(11, MOVE_DIRE_CLAW),
LEVEL_UP_MOVE(11, MOVE_SWIFT),
LEVEL_UP_MOVE(18, MOVE_SLASH),
//LEVEL_UP_MOVE(25, MOVE_POISON_JAB),
LEVEL_UP_MOVE(34, MOVE_SWORDS_DANCE),
//LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT),
LEVEL_UP_END
};
static const struct LevelUpMove sOverqwilLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_POISON_STING),
LEVEL_UP_MOVE( 5, MOVE_SPIKES),
LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE),
//LEVEL_UP_MOVE(15, MOVE_BARB_BARRAGE),
LEVEL_UP_MOVE(21, MOVE_WATER_PULSE),
//LEVEL_UP_MOVE(26, MOVE_DARK_PULSE),
//LEVEL_UP_MOVE(29, MOVE_POISON_JAB),
//LEVEL_UP_MOVE(37, MOVE_AQUA_TAIL,
LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE),
LEVEL_UP_MOVE(57, MOVE_SELF_DESTRUCT),
LEVEL_UP_END
};
static const struct LevelUpMove sEnamorusLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 7, MOVE_BITE),
LEVEL_UP_MOVE(11, MOVE_TWISTER),
//LEVEL_UP_MOVE(14, MOVE_DRAINING_KISS),
LEVEL_UP_MOVE(22, MOVE_IRON_DEFENSE),
LEVEL_UP_MOVE(31, MOVE_EXTRASENSORY),
LEVEL_UP_MOVE(41, MOVE_CRUNCH),
//LEVEL_UP_MOVE(47, MOVE_MOONBLAST),
//LEVEL_UP_MOVE( 1, MOVE_SPRINGTIDE_STORM),
LEVEL_UP_END
};
static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
@ -18841,6 +18931,220 @@ static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = {
LEVEL_UP_END
};
static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 5, MOVE_EMBER),
LEVEL_UP_MOVE( 9, MOVE_BITE),
//LEVEL_UP_MOVE(15, MOVE_FIRE_FANG),
LEVEL_UP_MOVE(21, MOVE_ROCK_SLIDE),
LEVEL_UP_MOVE(29, MOVE_CRUNCH),
LEVEL_UP_MOVE(37, MOVE_DOUBLE_EDGE),
//LEVEL_UP_MOVE(47, MOVE_FLARE_BLITZ),
LEVEL_UP_END
};
static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 5, MOVE_EMBER),
LEVEL_UP_MOVE( 9, MOVE_BITE),
//LEVEL_UP_MOVE(15, MOVE_FIRE_FANG),
LEVEL_UP_MOVE(21, MOVE_ROCK_SLIDE),
LEVEL_UP_MOVE(29, MOVE_CRUNCH),
//LEVEL_UP_MOVE(29, MOVE_RAGING_FURY),
LEVEL_UP_MOVE(37, MOVE_DOUBLE_EDGE),
//LEVEL_UP_MOVE(47, MOVE_FLARE_BLITZ),
LEVEL_UP_END
};
static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK),
LEVEL_UP_MOVE( 5, MOVE_TACKLE),
LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE),
LEVEL_UP_MOVE(15, MOVE_SPARK),
//LEVEL_UP_MOVE(21, MOVE_ENERGY_BALL),
LEVEL_UP_MOVE(29, MOVE_THUNDERBOLT),
LEVEL_UP_MOVE(37, MOVE_THUNDER),
LEVEL_UP_MOVE(47, MOVE_SELF_DESTRUCT),
LEVEL_UP_END
};
static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK),
LEVEL_UP_MOVE( 5, MOVE_TACKLE),
LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE),
LEVEL_UP_MOVE(15, MOVE_SPARK),
//LEVEL_UP_MOVE(21, MOVE_ENERGY_BALL),
LEVEL_UP_MOVE(29, MOVE_THUNDERBOLT),
LEVEL_UP_MOVE(37, MOVE_THUNDER),
//LEVEL_UP_MOVE(47, MOVE_CHLOROBLAST),
LEVEL_UP_MOVE(47, MOVE_SELF_DESTRUCT),
LEVEL_UP_END
};
static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_HEX),
LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
LEVEL_UP_MOVE( 6, MOVE_EMBER),
LEVEL_UP_MOVE(11, MOVE_ROLLOUT),
LEVEL_UP_MOVE(18, MOVE_FLAME_WHEEL),
LEVEL_UP_MOVE(25, MOVE_SWIFT),
LEVEL_UP_MOVE(34, MOVE_FLAMETHROWER),
//LEVEL_UP_MOVE(40, MOVE_INFERNAL_PARADE),
LEVEL_UP_MOVE(43, MOVE_OVERHEAT),
LEVEL_UP_MOVE(43, MOVE_SHADOW_BALL),
LEVEL_UP_END
};
static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_POISON_STING),
LEVEL_UP_MOVE( 5, MOVE_SPIKES),
LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE),
//LEVEL_UP_MOVE(15, MOVE_BARB_BARRAGE),
LEVEL_UP_MOVE(21, MOVE_WATER_PULSE),
//LEVEL_UP_MOVE(26, MOVE_DARK_PULSE),
//LEVEL_UP_MOVE(29, MOVE_POISON_JAB),
//LEVEL_UP_MOVE(37, MOVE_AQUA_TAIL,
LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE),
LEVEL_UP_MOVE(57, MOVE_SELF_DESTRUCT),
LEVEL_UP_END
};
static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH),
LEVEL_UP_MOVE(11, MOVE_SWIFT),
LEVEL_UP_MOVE(18, MOVE_SLASH),
//LEVEL_UP_MOVE(25, MOVE_POISON_JAB),
LEVEL_UP_MOVE(34, MOVE_SWORDS_DANCE),
//LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT),
LEVEL_UP_END
};
static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH),
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
//LEVEL_UP_MOVE( 6, MOVE_AQUA_JET),
LEVEL_UP_MOVE(11, MOVE_SWORDS_DANCE),
LEVEL_UP_MOVE(18, MOVE_WATER_PULSE),
//LEVEL_UP_MOVE(21, MOVE_CEASELESS_EDGE),
LEVEL_UP_MOVE(25, MOVE_SLASH),
//LEVEL_UP_MOVE(34, MOVE_AQUA_TAIL),
//LEVEL_UP_MOVE(40, MOVE_DARK_PULSE),
LEVEL_UP_MOVE(43, MOVE_HYDRO_PUMP),
LEVEL_UP_END
};
static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH),
LEVEL_UP_MOVE( 1, MOVE_ABSORB),
//LEVEL_UP_MOVE( 5, MOVE_LEAFAGE),
LEVEL_UP_MOVE( 9, MOVE_STUN_SPORE),
LEVEL_UP_MOVE(15, MOVE_POISON_POWDER),
//LEVEL_UP_MOVE(21, MOVE_ENERGY_BALL),
LEVEL_UP_MOVE(29, MOVE_SLEEP_POWDER),
//LEVEL_UP_MOVE(34, MOVE_DRAIN_PUNCH),
LEVEL_UP_MOVE(37, MOVE_LEAF_BLADE),
LEVEL_UP_MOVE(37, MOVE_RECOVER),
//LEVEL_UP_MOVE(42, MOVE_VICTORY_DANCE),
//LEVEL_UP_MOVE(47, MOVE_LEAF_STORM),
LEVEL_UP_MOVE(53, MOVE_PETAL_DANCE),
LEVEL_UP_MOVE(57, MOVE_CLOSE_COMBAT),
LEVEL_UP_END
};
static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK),
//LEVEL_UP_MOVE( 6, MOVE_SNARL),
LEVEL_UP_MOVE(11, MOVE_SWIFT),
//LEVEL_UP_MOVE(18, MOVE_BITTER_MALICE),
LEVEL_UP_MOVE(25, MOVE_SLASH),
//LEVEL_UP_MOVE(34, MOVE_SHADOW_CLAW),
//LEVEL_UP_MOVE(43, MOVE_NASTY_PLOT),
LEVEL_UP_END
};
static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK),
//LEVEL_UP_MOVE( 6, MOVE_SNARL),
LEVEL_UP_MOVE(11, MOVE_SWIFT),
//LEVEL_UP_MOVE(18, MOVE_BITTER_MALICE),
LEVEL_UP_MOVE(25, MOVE_SLASH),
//LEVEL_UP_MOVE(34, MOVE_SHADOW_CLAW),
LEVEL_UP_MOVE(40, MOVE_SHADOW_BALL),
//LEVEL_UP_MOVE(43, MOVE_NASTY_PLOT),
LEVEL_UP_MOVE(52, MOVE_EXTRASENSORY),
LEVEL_UP_END
};
static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE),
LEVEL_UP_MOVE(11, MOVE_TWISTER),
LEVEL_UP_MOVE(18, MOVE_SLASH),
//LEVEL_UP_MOVE(20, MOVE_AIR_SLASH),
//LEVEL_UP_MOVE(25, MOVE_ESPER_WING),
LEVEL_UP_MOVE(25, MOVE_ROOST),
LEVEL_UP_MOVE(34, MOVE_DOUBLE_EDGE),
//LEVEL_UP_MOVE(43, MOVE_BRAVE_BIRD),
//LEVEL_UP_MOVE(52, MOVE_HURRICANE),
LEVEL_UP_END
};
static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_BUBBLE),
//LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY),
LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR),
LEVEL_UP_MOVE(18, MOVE_WATER_PULSE),
//LEVEL_UP_MOVE(25, MOVE_DRAGON_PULSE),
//LEVEL_UP_MOVE(25, MOVE_IRON_HEAD),
//LEVEL_UP_MOVE(34, MOVE_SHELTER),
LEVEL_UP_MOVE(43, MOVE_HYDRO_PUMP),
LEVEL_UP_END
};
static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_BUBBLE),
//LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY),
LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR),
LEVEL_UP_MOVE(18, MOVE_WATER_PULSE),
//LEVEL_UP_MOVE(25, MOVE_DRAGON_PULSE),
//LEVEL_UP_MOVE(25, MOVE_IRON_HEAD),
//LEVEL_UP_MOVE(34, MOVE_SHELTER),
LEVEL_UP_MOVE(43, MOVE_HYDRO_PUMP),
LEVEL_UP_END
};
static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE),
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW),
//LEVEL_UP_MOVE( 9, MOVE_ICE_SHARD),
LEVEL_UP_MOVE(15, MOVE_BITE),
LEVEL_UP_MOVE(21, MOVE_IRON_DEFENSE),
LEVEL_UP_MOVE(29, MOVE_CRUNCH),
//LEVEL_UP_MOVE(29, MOVE_EARTH_POWER),
LEVEL_UP_MOVE(37, MOVE_BLIZZARD),
//LEVEL_UP_MOVE(37, MOVE_MOUNTAIN_GALE),
LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE),
LEVEL_UP_END
};
static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH),
LEVEL_UP_MOVE( 1, MOVE_GUST),
//LEVEL_UP_MOVE( 6, MOVE_LEAFAGE),
LEVEL_UP_MOVE(11, MOVE_ROOST),
LEVEL_UP_MOVE(18, MOVE_AERIAL_ACE),
LEVEL_UP_MOVE(21, MOVE_MAGICAL_LEAF),
//LEVEL_UP_MOVE(25, MOVE_AIR_SLASH),
//LEVEL_UP_MOVE(30, MOVE_AURA_SPHERE),
LEVEL_UP_MOVE(34, MOVE_LEAF_BLADE),
//LEVEL_UP_MOVE(34, MOVE_TRIPLE_ARROWS),
//LEVEL_UP_MOVE(40, MOVE_BRAVE_BIRD),
//LEVEL_UP_MOVE(43, MOVE_LEAF_STORM),
LEVEL_UP_END
};
static const struct LevelUpMove sDeoxysAttackLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_WRAP),

View File

@ -10787,4 +10787,88 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerScale = 256,
.trainerOffset = 0,
},
[NATIONAL_DEX_WYRDEER] =
{
.categoryName = _("Big Horn"),
.height = 18,
.weight = 951,
.description = gWyrdeerPokedexText,
.pokemonScale = 356,
.pokemonOffset = 17,
.trainerScale = 256,
.trainerOffset = 0,
},
[NATIONAL_DEX_KLEAVOR] =
{
.categoryName = _("Axe"),
.height = 18,
.weight = 890,
.description = gKleavorPokedexText,
.pokemonScale = 356,
.pokemonOffset = 17,
.trainerScale = 256,
.trainerOffset = 0,
},
[NATIONAL_DEX_URSALUNA] =
{
.categoryName = _("Peat"),
.height = 24,
.weight = 2900,
.description = gUrsalunaPokedexText,
.pokemonScale = 356,
.pokemonOffset = 17,
.trainerScale = 256,
.trainerOffset = 0,
},
[NATIONAL_DEX_BASCULEGION] =
{
.categoryName = _("Big Fish"),
.height = 30,
.weight = 1100,
.description = gBasculegionPokedexText,
.pokemonScale = 356,
.pokemonOffset = 17,
.trainerScale = 256,
.trainerOffset = 0,
},
[NATIONAL_DEX_SNEASLER] =
{
.categoryName = _("Free Climb"),
.height = 13,
.weight = 430,
.description = gSneaslerPokedexText,
.pokemonScale = 356,
.pokemonOffset = 17,
.trainerScale = 256,
.trainerOffset = 0,
},
[NATIONAL_DEX_OVERQWIL] =
{
.categoryName = _("Pin Cluster"),
.height = 25,
.weight = 605,
.description = gOverqwilPokedexText,
.pokemonScale = 356,
.pokemonOffset = 17,
.trainerScale = 256,
.trainerOffset = 0,
},
[NATIONAL_DEX_ENAMORUS] =
{
.categoryName = _("Love-Hate"),
.height = 16,
.weight = 480,
.description = gEnamorusPokedexText,
.pokemonScale = 356,
.pokemonOffset = 17,
.trainerScale = 256,
.trainerOffset = 0,
},
};

View File

@ -47,6 +47,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_BARBARACLE,
NATIONAL_DEX_BARBOACH,
NATIONAL_DEX_BARRASKEWDA,
NATIONAL_DEX_BASCULEGION,
NATIONAL_DEX_BASCULIN,
NATIONAL_DEX_BASTIODON,
NATIONAL_DEX_BAYLEEF,
@ -239,6 +240,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_EMBOAR,
NATIONAL_DEX_EMOLGA,
NATIONAL_DEX_EMPOLEON,
NATIONAL_DEX_ENAMORUS,
NATIONAL_DEX_ENTEI,
NATIONAL_DEX_ESCAVALIER,
NATIONAL_DEX_ESPEON,
@ -403,6 +405,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_KINGLER,
NATIONAL_DEX_KIRLIA,
NATIONAL_DEX_KLANG,
NATIONAL_DEX_KLEAVOR,
NATIONAL_DEX_KLEFKI,
NATIONAL_DEX_KLINK,
NATIONAL_DEX_KLINKLANG,
@ -562,6 +565,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_ORBEETLE,
NATIONAL_DEX_ORICORIO,
NATIONAL_DEX_OSHAWOTT,
NATIONAL_DEX_OVERQWIL,
NATIONAL_DEX_PACHIRISU,
NATIONAL_DEX_PALKIA,
@ -738,6 +742,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_SMEARGLE,
NATIONAL_DEX_SMOOCHUM,
NATIONAL_DEX_SNEASEL,
NATIONAL_DEX_SNEASLER,
NATIONAL_DEX_SNIVY,
NATIONAL_DEX_SNOM,
NATIONAL_DEX_SNORLAX,
@ -845,6 +850,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_UMBREON,
NATIONAL_DEX_UNFEZANT,
NATIONAL_DEX_UNOWN,
NATIONAL_DEX_URSALUNA,
NATIONAL_DEX_URSARING,
NATIONAL_DEX_URSHIFU,
NATIONAL_DEX_UXIE,
@ -897,6 +903,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_WORMADAM,
NATIONAL_DEX_WURMPLE,
NATIONAL_DEX_WYNAUT,
NATIONAL_DEX_WYRDEER,
NATIONAL_DEX_XATU,
NATIONAL_DEX_XERNEAS,
@ -1248,6 +1255,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_GOURGEIST, // Average Size
NATIONAL_DEX_MORGREM,
NATIONAL_DEX_IVYSAUR,
//NATIONAL_DEX_VOLTORB, //Hisuian Form
//NATIONAL_DEX_BANETTE, // Mega
NATIONAL_DEX_MIME_JR,
NATIONAL_DEX_LAMPENT,
@ -1324,6 +1332,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_QUILAVA,
NATIONAL_DEX_BRUXISH,
NATIONAL_DEX_STUNKY,
//NATIONAL_DEX_LILLIGANT, // Hisuian Form
NATIONAL_DEX_NIDORINO,
NATIONAL_DEX_ABRA,
NATIONAL_DEX_MACHOP,
@ -1373,6 +1382,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_WARTORTLE,
NATIONAL_DEX_LANTURN,
NATIONAL_DEX_GOREBYSS,
//NATIONAL_DEX_GROWLITHE, //Hisuian Form
NATIONAL_DEX_PRINPLUP,
NATIONAL_DEX_CROAGUNK,
NATIONAL_DEX_MOTHIM,
@ -1413,6 +1423,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_ESPEON,
NATIONAL_DEX_FROSLASS,
NATIONAL_DEX_UMBREON,
//NATIONAL_DEX_SNEASEL, //Hisuian Form
NATIONAL_DEX_HUNTAIL,
NATIONAL_DEX_CARNIVINE,
NATIONAL_DEX_WATCHOG,
@ -1516,6 +1527,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_PORYGON,
NATIONAL_DEX_DECIDUEYE,
NATIONAL_DEX_MIGHTYENA,
//NATIONAL_DEX_DECIDUEYE, //Hisuian Form
NATIONAL_DEX_LIEPARD,
NATIONAL_DEX_DARUMAKA,
NATIONAL_DEX_FEAROW,
@ -1564,6 +1576,8 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_DIGGERSBY,
NATIONAL_DEX_GLISCOR,
NATIONAL_DEX_DUBWOOL,
NATIONAL_DEX_SNEASLER,
//NATIONAL_DEX_BRAVIARY, //Hisuian Form
NATIONAL_DEX_PURUGLY,
//NATIONAL_DEX_MANECTRIC, // Mega
NATIONAL_DEX_GOTHITELLE,
@ -1586,6 +1600,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_HAKAMO_O,
NATIONAL_DEX_ALAKAZAM,
NATIONAL_DEX_HITMONTOP,
NATIONAL_DEX_ENAMORUS,
NATIONAL_DEX_GARDEVOIR,
NATIONAL_DEX_KELDEO,
NATIONAL_DEX_GRANBULL,
@ -1645,6 +1660,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_HEATMOR,
//NATIONAL_DEX_LURANTIS, // Totem-sized
//NATIONAL_DEX_ZAPDOS, // Galarian Form
//NATIONAL_DEX_SAMUROTT, // Hisuian Form
NATIONAL_DEX_MR_RIME,
NATIONAL_DEX_WHIRLIPEDE,
//NATIONAL_DEX_PINSIR, // Mega
@ -1661,6 +1677,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_CRADILY,
NATIONAL_DEX_BRONZOR,
NATIONAL_DEX_MUSHARNA,
NATIONAL_DEX_OVERQWIL,
NATIONAL_DEX_DEOXYS, // Normal Forme
//NATIONAL_DEX_DEOXYS, // Attack Forme
//NATIONAL_DEX_DEOXYS, // Defense Forme
@ -1688,16 +1705,20 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_MAGMORTAR,
NATIONAL_DEX_LANDORUS,
NATIONAL_DEX_ARMALDO,
//NATIONAL_DEX_SLIGGOO, //Hisuian Form
//NATIONAL_DEX_TYPHLOSION, //Hisuian Form
//NATIONAL_DEX_LATIOS, // Mega
NATIONAL_DEX_BISHARP,
NATIONAL_DEX_SANDYGAST,
NATIONAL_DEX_ZARUDE,
NATIONAL_DEX_MACHOKE,
//NATIONAL_DEX_SLOWBRO, // Galarian Form
//NATIONAL_DEX_ELECTRODE //Hisuian Form
NATIONAL_DEX_TREVENANT,
NATIONAL_DEX_STANTLER,
NATIONAL_DEX_GRUMPIG,
NATIONAL_DEX_LARVITAR,
//NATIONAL_DEX_ZOROARK, //Hisuian Form
NATIONAL_DEX_CROBAT,
NATIONAL_DEX_QUAGSIRE,
NATIONAL_DEX_CORVIKNIGHT,
@ -1749,6 +1770,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_FERALIGATR,
NATIONAL_DEX_SHARPEDO,
NATIONAL_DEX_EISCUE,
NATIONAL_DEX_KLEAVOR,
NATIONAL_DEX_SEEL,
NATIONAL_DEX_CHESNAUGHT,
NATIONAL_DEX_RILLABOOM,
@ -1762,6 +1784,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_SAMUROTT,
NATIONAL_DEX_RAPIDASH,
NATIONAL_DEX_GARCHOMP,
NATIONAL_DEX_WYRDEER,
NATIONAL_DEX_BELDUM,
NATIONAL_DEX_BARBARACLE,
NATIONAL_DEX_KROOKODILE,
@ -1800,6 +1823,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_FERROTHORN,
NATIONAL_DEX_MUDBRAY,
NATIONAL_DEX_ZACIAN, // Hero of Many Battles
NATIONAL_DEX_BASCULEGION,
//NATIONAL_DEX_CHARIZARD, // Mega X
NATIONAL_DEX_SHELGON,
//NATIONAL_DEX_SALAMENCE, // Mega
@ -1853,6 +1877,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_HYDREIGON,
//NATIONAL_DEX_SABLEYE, // Mega
NATIONAL_DEX_MILOTIC,
//NATIONAL_DEX_ARCANINE, //Hisuian Form
NATIONAL_DEX_LUNATONE,
NATIONAL_DEX_REGICE,
NATIONAL_DEX_ARCTOVISH,
@ -1905,8 +1930,10 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_GIGALITH,
NATIONAL_DEX_BEARTIC,
NATIONAL_DEX_TERRAKION,
//NATIONAL_DEX_AVALUGG, //Hisuian Form
NATIONAL_DEX_TYRANTRUM,
NATIONAL_DEX_RHYPERIOR,
NATIONAL_DEX_URSALUNA,
NATIONAL_DEX_MAMOSWINE,
// 661.4 - 667.0 lbs / 300.0 - 307.1 kg
NATIONAL_DEX_GOLEM,
@ -1923,6 +1950,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_GOLURK,
NATIONAL_DEX_RESHIRAM,
NATIONAL_DEX_BUZZWOLE,
//NATIONAL_DEX_GOODRA, //Hisuian Form
NATIONAL_DEX_PALKIA,
NATIONAL_DEX_PROBOPASS,
NATIONAL_DEX_ZEKROM,
@ -1949,6 +1977,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_METAGROSS,
//NATIONAL_DEX_ZYGARDE, // Complete Forme
//NATIONAL_DEX_GIRATINA, // Origin Forme
//NATIONAL_DEX_PALKIA, // Origin Form
NATIONAL_DEX_DIALGA,
//NATIONAL_DEX_STEELIX, // Mega
NATIONAL_DEX_GIRATINA, // Altered Forme
@ -1957,6 +1986,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_GLASTRIER,
//NATIONAL_DEX_CALYREX, // Ice Rider
NATIONAL_DEX_STAKATAKA,
//NATIONAL_DEX_DIALGA, // Origin Form
NATIONAL_DEX_GUZZLORD,
NATIONAL_DEX_MUDSDALE,
//NATIONAL_DEX_METAGROSS, // Mega
@ -2155,6 +2185,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_ODDISH,
NATIONAL_DEX_MANKEY,
NATIONAL_DEX_VOLTORB,
//NATIONAL_DEX_VOLTORB, //Hisuian Form
NATIONAL_DEX_KABUTO,
NATIONAL_DEX_CYNDAQUIL,
NATIONAL_DEX_SPINARAK,
@ -2162,6 +2193,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_MURKROW,
NATIONAL_DEX_UNOWN,
NATIONAL_DEX_QWILFISH,
//NATIONAL_DEX_QWILFISH, //Hisuian Form
NATIONAL_DEX_PHANPY,
NATIONAL_DEX_TREECKO,
NATIONAL_DEX_POOCHYENA,
@ -2340,11 +2372,13 @@ const u16 gPokedexOrder_Height[] =
//NATIONAL_DEX_DARUMAKA, // Galarian Form
NATIONAL_DEX_TIRTOUGA,
NATIONAL_DEX_ZORUA,
//NATIONAL_DEX_ZORUA, // Hisuian Form
NATIONAL_DEX_GOTHORITA,
NATIONAL_DEX_STUNFISK,
//NATIONAL_DEX_STUNFISK, // Galarian Form
NATIONAL_DEX_QUILLADIN,
NATIONAL_DEX_FLETCHINDER,
//NATIONAL_DEX_SLIGGOO, // Hisuian Form
//NATIONAL_DEX_GOURGEIST, // Small Size
NATIONAL_DEX_DIANCIE,
NATIONAL_DEX_DARTRIX,
@ -2421,6 +2455,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_QUILAVA,
NATIONAL_DEX_ESPEON,
NATIONAL_DEX_SNEASEL,
//NATIONAL_DEX_SNEASEL, //Hisuian Form
NATIONAL_DEX_OCTILLERY,
NATIONAL_DEX_DELIBIRD,
NATIONAL_DEX_GROVYLE,
@ -2572,6 +2607,7 @@ const u16 gPokedexOrder_Height[] =
//NATIONAL_DEX_SLOWPOKE, // Galarian Form
NATIONAL_DEX_MUK,
NATIONAL_DEX_ELECTRODE,
//NATIONAL_DEX_ELECTRODE, //Hisuian Form
NATIONAL_DEX_LICKITUNG,
NATIONAL_DEX_WEEZING,
NATIONAL_DEX_SEADRA,
@ -2606,6 +2642,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_GURDURR,
NATIONAL_DEX_LEAVANNY,
NATIONAL_DEX_WHIRLIPEDE,
//NATIONAL_DEX_LILLIGANT, //Hisuian Form
NATIONAL_DEX_CARRACOSTA,
NATIONAL_DEX_FRILLISH,
NATIONAL_DEX_ALOMOMOLA,
@ -2660,6 +2697,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_DUBWOOL,
NATIONAL_DEX_BARRASKEWDA,
NATIONAL_DEX_FROSMOTH,
NATIONAL_DEX_SNEASLER,
// 4'07" / 1.4m
//NATIONAL_DEX_BEEDRILL, // Mega
//NATIONAL_DEX_RATICATE, // Alolan Form, Totem-sized
@ -2696,6 +2734,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_ZWEILOUS,
//NATIONAL_DEX_TORNADUS, // Therian Forme
NATIONAL_DEX_KELDEO,
//NATIONAL_DEX_AVALUGG, // Hisuian Form
//NATIONAL_DEX_GUMSHOOS, // Totem-sized
NATIONAL_DEX_CINDERACE,
NATIONAL_DEX_EISCUE,
@ -2730,6 +2769,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_CRESSELIA,
NATIONAL_DEX_DARKRAI,
NATIONAL_DEX_SAMUROTT,
//NATIONAL_DEX_SAMUROTT, // Hisuian Form
//NATIONAL_DEX_AUDINO, // Mega
NATIONAL_DEX_CONKELDURR,
NATIONAL_DEX_SEISMITOAD,
@ -2765,6 +2805,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_HYPNO,
NATIONAL_DEX_ZAPDOS,
//NATIONAL_DEX_ZAPDOS, // Galarian Form
//NATIONAL_DEX_TYPHLOSION, // Hisuian Form
NATIONAL_DEX_NOCTOWL,
NATIONAL_DEX_GARDEVOIR,
//NATIONAL_DEX_GARDEVOIR, // Mega
@ -2777,17 +2818,22 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_EMBOAR,
NATIONAL_DEX_ZEBSTRIKA,
NATIONAL_DEX_ZOROARK,
//NATIONAL_DEX_ZOROARK, // Hisuian Form
NATIONAL_DEX_DRUDDIGON,
NATIONAL_DEX_BISHARP,
NATIONAL_DEX_BOUFFALANT,
//NATIONAL_DEX_BRAVIARY, // Hisuian Form
NATIONAL_DEX_VOLCARONA,
NATIONAL_DEX_CHESNAUGHT,
NATIONAL_DEX_DECIDUEYE,
//NATIONAL_DEX_DECIDUEYE, // Hisuian Form
NATIONAL_DEX_KOMMO_O,
NATIONAL_DEX_TOXTRICITY,
NATIONAL_DEX_GRAPPLOCT,
NATIONAL_DEX_OBSTAGOON,
NATIONAL_DEX_RUNERIGUS,
NATIONAL_DEX_ENAMORUS,
//NATIONAL_DEX_ENAMORUS, //Therian Form
// 5'07" / 1.7m
NATIONAL_DEX_CHARIZARD,
//NATIONAL_DEX_CHARIZARD, // Mega X
@ -2820,6 +2866,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_COFAGRIGUS,
NATIONAL_DEX_GOGOAT,
NATIONAL_DEX_AEGISLASH,
//NATIONAL_DEX_GOODRA, //Hisuian Form
//NATIONAL_DEX_GOURGEIST, // Super Size
NATIONAL_DEX_VOLCANION,
NATIONAL_DEX_CRABOMINABLE,
@ -2853,6 +2900,8 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_DRACOZOLT,
NATIONAL_DEX_DURALUDON,
NATIONAL_DEX_ZARUDE,
NATIONAL_DEX_WYRDEER,
NATIONAL_DEX_KLEAVOR,
// 6'03" / 1.9m
NATIONAL_DEX_ARCANINE,
NATIONAL_DEX_RHYDON,
@ -2878,6 +2927,7 @@ const u16 gPokedexOrder_Height[] =
// 6'07" / 2.0m
NATIONAL_DEX_VENUSAUR,
NATIONAL_DEX_EKANS,
//NATIONAL_DEX_ARCANINE, //Hisuian Form
//NATIONAL_DEX_SLOWBRO, // Mega
NATIONAL_DEX_EXEGGUTOR,
NATIONAL_DEX_MOLTRES,
@ -2947,6 +2997,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_NECROZMA,
//NATIONAL_DEX_CALYREX, // Ice Rider
//NATIONAL_DEX_CALYREX, // Shadow Rider
NATIONAL_DEX_URSALUNA,
// 8'02" / 2.5m
NATIONAL_DEX_LAPRAS,
//NATIONAL_DEX_TYRANITAR, // Mega
@ -2959,6 +3010,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_MUDSDALE,
NATIONAL_DEX_MELMETAL,
NATIONAL_DEX_STONJOURNER,
NATIONAL_DEX_OVERQWIL,
// 8'06" / 2.6m
NATIONAL_DEX_BEARTIC,
//NATIONAL_DEX_VIKAVOLT, // Totem-sized
@ -2985,6 +3037,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_FALINKS,
NATIONAL_DEX_COPPERAJAH,
NATIONAL_DEX_DRAGAPULT,
NATIONAL_DEX_BASCULEGION,
// 10'02" / 3.1m
//NATIONAL_DEX_ARAQUANID, // Totem-sized
// 10'06" / 3.2m
@ -3034,6 +3087,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_YVELTAL,
// 20'04" / 6.2m
NATIONAL_DEX_MILOTIC,
//NATIONAL_DEX_PALKIA, //Origin Forme
// 21'04" / 6.5m
NATIONAL_DEX_GYARADOS,
//NATIONAL_DEX_GYARADOS, // Mega
@ -3042,6 +3096,7 @@ const u16 gPokedexOrder_Height[] =
//NATIONAL_DEX_GIRATINA, // Origin Forme
// 23'00" / 7.0m
NATIONAL_DEX_RAYQUAZA,
//NATIONAL_DEX_DIALGA, //Origin Forme
// 24'07" / 7.5m
//NATIONAL_DEX_NECROZMA, // Ultra
// 26'11" / 8.2m

View File

@ -5348,3 +5348,43 @@ const u8 gCalyrexPokedexText[] = _(
"providing healing and blessings. It\n"
"reigned over the Galar region in times\n"
"of yore.");
const u8 gWyrdeerPokedexText[] = _(
"The black orbs shine with an uncanny light\n"
"when it is erecting invisible barriers.\n"
"The fur shed from its beard retains heat\n"
"and useful for winter clothing.");
const u8 gKleavorPokedexText[] = _(
"A violent creature that fells trees with\n"
"its crude axes and shields itself with hard\n"
"stone. If one should encounter this Pokémon\n"
"in the wild, one's only recourse is to flee.");
const u8 gUrsalunaPokedexText[] = _(
"Swampy terrain gives Ursaluna its burly\n"
"physique and newfound capacity to\n"
"manipulate peat at will.");
const u8 gBasculegionPokedexText[] = _(
"It clads itself in the souls of comrades\n"
"that perishes before their goals of\n"
"journeying upstream.");
const u8 gSneaslerPokedexText[] = _(
"Because of its wicked poison and daunting\n"
"physical prowess, no other species could\n"
"hope to best it on frozen highlands. It\n"
"prefers solitude and doesn't form packs.");
const u8 gOverqwilPokedexText[] = _(
"Its lancelike spikes and savage\n"
"temperament have earned it the\n"
"nickname Sea Fiend.\n"
"It surps up poison to nourish itself.");
const u8 gEnamorusPokedexText[] = _(
"Its arrival brings an end to the\n"
"winter. According to legend, this\n"
"Pokémon's love gives rise to the\n"
"budding of fresh life across the land.");

View File

@ -20193,6 +20193,20 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM22_SOLAR_BEAM)
| TMHM(TM11_SUNNY_DAY)),
[SPECIES_WYRDEER] = TMHM_LEARNSET(0),
[SPECIES_KLEAVOR] = TMHM_LEARNSET(0),
[SPECIES_URSALUNA] = TMHM_LEARNSET(0),
[SPECIES_BASCULEGION] = TMHM_LEARNSET(0),
[SPECIES_SNEASLER] = TMHM_LEARNSET(0),
[SPECIES_OVERQWIL] = TMHM_LEARNSET(0),
[SPECIES_ENAMORUS] = TMHM_LEARNSET(0),
[SPECIES_RATTATA_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD)
| TMHM(HM01_CUT)
| TMHM(TM28_DIG)
@ -20761,6 +20775,38 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM36_SLUDGE_BOMB)
| TMHM(HM03_SURF)),
[SPECIES_GROWLITHE_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_ARCANINE_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_VOLTORB_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_ELECTRODE_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_TYPHLOSION_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_QWILFISH_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_SNEASEL_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_SAMUROTT_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_LILLIGANT_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_ZORUA_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_ZOROARK_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_BRAVIARY_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_SLIGGOO_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_GOODRA_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_AVALUGG_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_DECIDUEYE_HISUIAN] = TMHM_LEARNSET(0),
[SPECIES_PIKACHU_COSPLAY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT)
| TMHM(TM31_BRICK_BREAK)
| TMHM(TM28_DIG)
@ -21389,6 +21435,78 @@ const u32 gTMHMLearnsets[][2] =
[SPECIES_ROTOM_MOW] = TMHM_LEARNSET(0),
[SPECIES_DIALGA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE)
| TMHM(TM14_BLIZZARD)
| TMHM(TM31_BRICK_BREAK)
| TMHM(TM08_BULK_UP)
| TMHM(HM01_CUT)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM02_DRAGON_CLAW)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM42_FACADE)
| TMHM(TM38_FIRE_BLAST)
| TMHM(TM35_FLAMETHROWER)
| TMHM(HM05_FLASH)
| TMHM(TM21_FRUSTRATION)
| TMHM(TM10_HIDDEN_POWER)
| TMHM(TM15_HYPER_BEAM)
| TMHM(TM13_ICE_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM50_OVERHEAT)
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM44_REST)
| TMHM(TM27_RETURN)
| TMHM(TM05_ROAR)
| TMHM(HM06_ROCK_SMASH)
| TMHM(TM39_ROCK_TOMB)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM37_SANDSTORM)
| TMHM(TM43_SECRET_POWER)
| TMHM(TM34_SHOCK_WAVE)
| TMHM(HM04_STRENGTH)
| TMHM(TM11_SUNNY_DAY)
| TMHM(TM25_THUNDER)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM06_TOXIC)),
[SPECIES_PALKIA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE)
| TMHM(TM14_BLIZZARD)
| TMHM(TM31_BRICK_BREAK)
| TMHM(TM08_BULK_UP)
| TMHM(HM01_CUT)
| TMHM(HM08_DIVE)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM02_DRAGON_CLAW)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM42_FACADE)
| TMHM(TM38_FIRE_BLAST)
| TMHM(TM35_FLAMETHROWER)
| TMHM(TM01_FOCUS_PUNCH)
| TMHM(TM21_FRUSTRATION)
| TMHM(TM07_HAIL)
| TMHM(TM10_HIDDEN_POWER)
| TMHM(TM15_HYPER_BEAM)
| TMHM(TM13_ICE_BEAM)
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM44_REST)
| TMHM(TM27_RETURN)
| TMHM(TM05_ROAR)
| TMHM(HM06_ROCK_SMASH)
| TMHM(TM39_ROCK_TOMB)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM37_SANDSTORM)
| TMHM(TM43_SECRET_POWER)
| TMHM(TM34_SHOCK_WAVE)
| TMHM(HM04_STRENGTH)
| TMHM(TM11_SUNNY_DAY)
| TMHM(HM03_SURF)
| TMHM(TM25_THUNDER)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM06_TOXIC)
| TMHM(TM03_WATER_PULSE)),
[SPECIES_GIRATINA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE)
| TMHM(TM04_CALM_MIND)
| TMHM(HM01_CUT)
@ -22289,6 +22407,25 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM06_TOXIC)
| TMHM(HM07_WATERFALL)),
[SPECIES_BASCULIN_WHITE_STRIPED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT)
| TMHM(HM01_CUT)
| TMHM(HM08_DIVE)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM42_FACADE)
| TMHM(TM21_FRUSTRATION)
| TMHM(TM07_HAIL)
| TMHM(TM10_HIDDEN_POWER)
| TMHM(TM13_ICE_BEAM)
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM44_REST)
| TMHM(TM27_RETURN)
| TMHM(TM43_SECRET_POWER)
| TMHM(HM03_SURF)
| TMHM(TM12_TAUNT)
| TMHM(TM06_TOXIC)
| TMHM(HM07_WATERFALL)),
[SPECIES_DEERLING_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM42_FACADE)
@ -22489,6 +22626,8 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(HM04_STRENGTH)
| TMHM(TM06_TOXIC)),
[SPECIES_ENAMORUS_THERIAN] = TMHM_LEARNSET(0),
[SPECIES_KYUREM_WHITE] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD)
| TMHM(HM01_CUT)
| TMHM(TM32_DOUBLE_TEAM)

View File

@ -10188,6 +10188,20 @@ static const u32 sTutorLearnsets[] =
| TUTOR(MOVE_SUBSTITUTE)
| TUTOR(MOVE_SWIFT)),
[SPECIES_WYRDEER] = (0),
[SPECIES_KLEAVOR] = (0),
[SPECIES_URSALUNA] = (0),
[SPECIES_BASCULEGION] = (0),
[SPECIES_SNEASLER] = (0),
[SPECIES_OVERQWIL] = (0),
[SPECIES_ENAMORUS] = (0),
[SPECIES_MEOWTH_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM)
| TUTOR(MOVE_DOUBLE_EDGE)
| TUTOR(MOVE_ENDURE)
@ -10366,6 +10380,38 @@ static const u32 sTutorLearnsets[] =
| TUTOR(MOVE_SUBSTITUTE)
| TUTOR(MOVE_THUNDER_WAVE)),
[SPECIES_GROWLITHE_HISUIAN] = (0),
[SPECIES_ARCANINE_HISUIAN] = (0),
[SPECIES_VOLTORB_HISUIAN] = (0),
[SPECIES_ELECTRODE_HISUIAN] = (0),
[SPECIES_TYPHLOSION_HISUIAN] = (0),
[SPECIES_QWILFISH_HISUIAN] = (0),
[SPECIES_SNEASEL_HISUIAN] = (0),
[SPECIES_SAMUROTT_HISUIAN] = (0),
[SPECIES_LILLIGANT_HISUIAN] = (0),
[SPECIES_ZORUA_HISUIAN] = (0),
[SPECIES_ZOROARK_HISUIAN] = (0),
[SPECIES_BRAVIARY_HISUIAN] = (0),
[SPECIES_SLIGGOO_HISUIAN] = (0),
[SPECIES_GOODRA_HISUIAN] = (0),
[SPECIES_AVALUGG_HISUIAN] = (0),
[SPECIES_DECIDUEYE_HISUIAN] = (0),
[SPECIES_BURMY_SANDY_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)),
[SPECIES_BURMY_TRASH_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)),

View File

@ -4499,6 +4499,41 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(56, 48),
.y_offset = 10,
},
[SPECIES_WYRDEER] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_KLEAVOR] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_URSALUNA] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_BASCULEGION] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_SNEASLER] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_OVERQWIL] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ENAMORUS] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Megas
[SPECIES_VENUSAUR_MEGA] =
{
@ -4937,6 +4972,87 @@ const struct MonCoords gMonBackPicCoords[] =
{
.size = MON_COORDS_SIZE(64, 24),
.y_offset = 23,
},
// Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ARCANINE_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_VOLTORB_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ELECTRODE_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_TYPHLOSION_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_QWILFISH_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_SNEASEL_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_SAMUROTT_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_LILLIGANT_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ZORUA_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ZOROARK_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_BRAVIARY_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_SLIGGOO_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_GOODRA_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_AVALUGG_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_DECIDUEYE_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Misc Forms
// Cosplay Pikachu
@ -5251,7 +5367,17 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(56, 48),
.y_offset = 10,
},
// Giratina
// Origin Forme
[SPECIES_DIALGA_ORIGIN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_PALKIA_ORIGIN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_GIRATINA_ORIGIN] =
{
.size = MON_COORDS_SIZE(64, 56),
@ -5355,6 +5481,11 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 48),
.y_offset = 16,
},
[SPECIES_BASCULIN_WHITE_STRIPED] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Darmanitan
[SPECIES_DARMANITAN_ZEN_MODE] =
{
@ -5414,6 +5545,11 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 56),
.y_offset = 7,
},
[SPECIES_ENAMORUS_THERIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Kyurem
[SPECIES_KYUREM_WHITE] =
{

View File

@ -899,6 +899,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(GLASTRIER, gMonBackPic_Glastrier),
SPECIES_SPRITE(SPECTRIER, gMonBackPic_Spectrier),
SPECIES_SPRITE(CALYREX, gMonBackPic_Calyrex),
SPECIES_SPRITE(WYRDEER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Wyrdeer),
SPECIES_SPRITE(KLEAVOR, gMonBackPic_CircledQuestionMark), //gMonBackPic_Kleavor),
SPECIES_SPRITE(URSALUNA, gMonBackPic_CircledQuestionMark), //gMonBackPic_Ursaluna),
SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler),
SPECIES_SPRITE(OVERQWIL, gMonBackPic_CircledQuestionMark), //gMonBackPic_Overqwil),
SPECIES_SPRITE(ENAMORUS, gMonBackPic_CircledQuestionMark), //gMonBackPic_Enamorus),
SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_VenusaurMega),
SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonBackPic_CharizardMegaX),
@ -991,6 +998,23 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(YAMASK_GALARIAN, gMonBackPic_YamaskGalarian),
SPECIES_SPRITE(STUNFISK_GALARIAN, gMonBackPic_StunfiskGalarian),
SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_GrowlitheHisuian),
SPECIES_SPRITE(ARCANINE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_ArcanineHisuian),
SPECIES_SPRITE(VOLTORB_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_VoltorbHisuian),
SPECIES_SPRITE(ELECTRODE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_ElectrodeHisuian),
SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_TyphlosionHisuian),
SPECIES_SPRITE(QWILFISH_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_QwilfishHisuian),
SPECIES_SPRITE(SNEASEL_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SneaselHisuian),
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SamurottHisuian),
SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_LilligantHisuian),
SPECIES_SPRITE(ZORUA_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_ZoruaHisuian),
SPECIES_SPRITE(ZOROARK_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_ZoroarkHisuian),
SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_BraviaryHisuian),
SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SliggooHisuian),
SPECIES_SPRITE(GOODRA_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_GoodraHisuian),
SPECIES_SPRITE(AVALUGG_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_AvaluggHisuian),
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian),
SPECIES_SPRITE(PIKACHU_COSPLAY, gMonBackPic_PikachuCosplay),
SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonBackPic_PikachuRockStar),
SPECIES_SPRITE(PIKACHU_BELLE, gMonBackPic_PikachuBelle),
@ -1063,6 +1087,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(ROTOM_FAN, gMonBackPic_RotomFan),
SPECIES_SPRITE(ROTOM_MOW, gMonBackPic_RotomMow),
SPECIES_SPRITE(DIALGA_ORIGIN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DialgaOrigin),
SPECIES_SPRITE(PALKIA_ORIGIN, gMonBackPic_CircledQuestionMark), //gMonBackPic_PalkiaOrigin),
SPECIES_SPRITE(GIRATINA_ORIGIN, gMonBackPic_GiratinaOrigin),
SPECIES_SPRITE(SHAYMIN_SKY, gMonBackPic_ShayminSky),
@ -1086,6 +1112,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(ARCEUS_FAIRY, gMonBackPic_Arceus),
SPECIES_SPRITE(BASCULIN_BLUE_STRIPED, gMonBackPic_BasculinBlueStriped),
SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculinWhiteStriped),
SPECIES_SPRITE(DARMANITAN_ZEN_MODE, gMonBackPic_DarmanitanZenMode),
SPECIES_SPRITE(DARMANITAN_ZEN_MODE_GALARIAN, gMonBackPic_DarmanitanZenModeGalarian),
@ -1101,6 +1128,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(TORNADUS_THERIAN, gMonBackPic_TornadusTherian),
SPECIES_SPRITE(THUNDURUS_THERIAN, gMonBackPic_ThundurusTherian),
SPECIES_SPRITE(LANDORUS_THERIAN, gMonBackPic_LandorusTherian),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian),
SPECIES_SPRITE(KYUREM_WHITE, gMonBackPic_KyuremWhite),
SPECIES_SPRITE(KYUREM_BLACK, gMonBackPic_KyuremBlack),
@ -1292,4 +1320,5 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF),
SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF),
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF),
};

View File

@ -8527,6 +8527,48 @@ static const union AnimCmd sAnim_CALYREX_1[] =
ANIMCMD_END,
};
static const union AnimCmd sAnim_WYRDEER_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_KLEAVOR_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_URSALUNA_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_BASCULEGION_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_SNEASLER_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_OVERQWIL_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_ENAMORUS_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_VENUSAUR_MEGA_1[] =
{
ANIMCMD_FRAME(0, 1),
@ -9049,12 +9091,120 @@ static const union AnimCmd sAnim_STUNFISK_GALARIAN_1[] =
ANIMCMD_END,
};
static const union AnimCmd sAnim_GROWLITHE_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_ARCANINE_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_VOLTORB_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_ELECTRODE_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_TYPHLOSION_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_QWILFISH_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_SNEASEL_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_SAMUROTT_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_LILLIGANT_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_ZORUA_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_ZOROARK_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_BRAVIARY_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_SLIGGOO_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_GOODRA_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_AVALUGG_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_DECIDUEYE_HISUIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_SHAYMIN_SKY_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_DIALGA_ORIGIN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_PALKIA_ORIGIN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_GIRATINA_ORIGIN_1[] =
{
ANIMCMD_FRAME(0, 1),
@ -9091,6 +9241,12 @@ static const union AnimCmd sAnim_LANDORUS_THERIAN_1[] =
ANIMCMD_END,
};
static const union AnimCmd sAnim_ENAMORUS_THERIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_KELDEO_RESOLUTE_1[] =
{
ANIMCMD_FRAME(0, 1),
@ -14041,6 +14197,41 @@ static const union AnimCmd *const sAnims_CALYREX[] ={
sAnim_CALYREX_1,
};
static const union AnimCmd *const sAnims_WYRDEER[] ={
sAnim_GeneralFrame0,
sAnim_WYRDEER_1,
};
static const union AnimCmd *const sAnims_KLEAVOR[] ={
sAnim_GeneralFrame0,
sAnim_KLEAVOR_1,
};
static const union AnimCmd *const sAnims_URSALUNA[] ={
sAnim_GeneralFrame0,
sAnim_URSALUNA_1,
};
static const union AnimCmd *const sAnims_BASCULEGION[] ={
sAnim_GeneralFrame0,
sAnim_BASCULEGION_1,
};
static const union AnimCmd *const sAnims_SNEASLER[] ={
sAnim_GeneralFrame0,
sAnim_SNEASLER_1,
};
static const union AnimCmd *const sAnims_OVERQWIL[] ={
sAnim_GeneralFrame0,
sAnim_OVERQWIL_1,
};
static const union AnimCmd *const sAnims_ENAMORUS[] ={
sAnim_GeneralFrame0,
sAnim_ENAMORUS_1,
};
static const union AnimCmd *const sAnims_VENUSAUR_MEGA[] ={
sAnim_GeneralFrame0,
sAnim_VENUSAUR_MEGA_1,
@ -14476,11 +14667,101 @@ static const union AnimCmd *const sAnims_STUNFISK_GALARIAN[] ={
sAnim_STUNFISK_GALARIAN_1,
};
static const union AnimCmd *const sAnims_GROWLITHE_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_GROWLITHE_HISUIAN_1,
};
static const union AnimCmd *const sAnims_ARCANINE_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_ARCANINE_HISUIAN_1,
};
static const union AnimCmd *const sAnims_VOLTORB_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_VOLTORB_HISUIAN_1,
};
static const union AnimCmd *const sAnims_ELECTRODE_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_ELECTRODE_HISUIAN_1,
};
static const union AnimCmd *const sAnims_TYPHLOSION_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_TYPHLOSION_HISUIAN_1,
};
static const union AnimCmd *const sAnims_QWILFISH_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_QWILFISH_HISUIAN_1,
};
static const union AnimCmd *const sAnims_SNEASEL_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_SNEASEL_HISUIAN_1,
};
static const union AnimCmd *const sAnims_SAMUROTT_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_SAMUROTT_HISUIAN_1,
};
static const union AnimCmd *const sAnims_LILLIGANT_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_LILLIGANT_HISUIAN_1,
};
static const union AnimCmd *const sAnims_ZORUA_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_ZORUA_HISUIAN_1,
};
static const union AnimCmd *const sAnims_ZOROARK_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_ZOROARK_HISUIAN_1,
};
static const union AnimCmd *const sAnims_BRAVIARY_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_BRAVIARY_HISUIAN_1,
};
static const union AnimCmd *const sAnims_SLIGGOO_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_SLIGGOO_HISUIAN_1,
};
static const union AnimCmd *const sAnims_GOODRA_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_GOODRA_HISUIAN_1,
};
static const union AnimCmd *const sAnims_AVALUGG_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_AVALUGG_HISUIAN_1,
};
static const union AnimCmd *const sAnims_DECIDUEYE_HISUIAN[] ={
sAnim_GeneralFrame0,
sAnim_DECIDUEYE_HISUIAN_1,
};
static const union AnimCmd *const sAnims_SHAYMIN_SKY[] ={
sAnim_GeneralFrame0,
sAnim_SHAYMIN_SKY_1,
};
static const union AnimCmd *const sAnims_DIALGA_ORIGIN[] ={
sAnim_GeneralFrame0,
sAnim_DIALGA_ORIGIN_1,
};
static const union AnimCmd *const sAnims_PALKIA_ORIGIN[] ={
sAnim_GeneralFrame0,
sAnim_PALKIA_ORIGIN_1,
};
static const union AnimCmd *const sAnims_GIRATINA_ORIGIN[] ={
sAnim_GeneralFrame0,
sAnim_GIRATINA_ORIGIN_1,
@ -14511,6 +14792,11 @@ static const union AnimCmd *const sAnims_LANDORUS_THERIAN[] ={
sAnim_LANDORUS_THERIAN_1,
};
static const union AnimCmd *const sAnims_ENAMORUS_THERIAN[] ={
sAnim_GeneralFrame0,
sAnim_ENAMORUS_THERIAN_1,
};
static const union AnimCmd *const sAnims_KELDEO_RESOLUTE[] ={
sAnim_GeneralFrame0,
sAnim_KELDEO_RESOLUTE_1,
@ -15573,6 +15859,13 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(GLASTRIER),
ANIM_CMD(SPECTRIER),
ANIM_CMD(CALYREX),
ANIM_CMD(WYRDEER),
ANIM_CMD(KLEAVOR),
ANIM_CMD(URSALUNA),
ANIM_CMD(BASCULEGION),
ANIM_CMD(SNEASLER),
ANIM_CMD(OVERQWIL),
ANIM_CMD(ENAMORUS),
ANIM_CMD(VENUSAUR_MEGA),
ANIM_CMD(CHARIZARD_MEGA_X),
ANIM_CMD(CHARIZARD_MEGA_Y),
@ -15660,6 +15953,22 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(DARMANITAN_GALARIAN),
ANIM_CMD(YAMASK_GALARIAN),
ANIM_CMD(STUNFISK_GALARIAN),
ANIM_CMD(GROWLITHE_HISUIAN),
ANIM_CMD(ARCANINE_HISUIAN),
ANIM_CMD(VOLTORB_HISUIAN),
ANIM_CMD(ELECTRODE_HISUIAN),
ANIM_CMD(TYPHLOSION_HISUIAN),
ANIM_CMD(QWILFISH_HISUIAN),
ANIM_CMD(SNEASEL_HISUIAN),
ANIM_CMD(SAMUROTT_HISUIAN),
ANIM_CMD(LILLIGANT_HISUIAN),
ANIM_CMD(ZORUA_HISUIAN),
ANIM_CMD(ZOROARK_HISUIAN),
ANIM_CMD(BRAVIARY_HISUIAN),
ANIM_CMD(SLIGGOO_HISUIAN),
ANIM_CMD(GOODRA_HISUIAN),
ANIM_CMD(AVALUGG_HISUIAN),
ANIM_CMD(DECIDUEYE_HISUIAN),
ANIM_CMD(PIKACHU_COSPLAY),
ANIM_CMD(PIKACHU_ROCK_STAR),
ANIM_CMD(PIKACHU_BELLE),
@ -15720,6 +16029,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(ROTOM_FROST),
ANIM_CMD(ROTOM_FAN),
ANIM_CMD(ROTOM_MOW),
ANIM_CMD(DIALGA_ORIGIN),
ANIM_CMD(PALKIA_ORIGIN),
ANIM_CMD(GIRATINA_ORIGIN),
ANIM_CMD(SHAYMIN_SKY),
ANIM_CMD_FULL(ARCEUS_FIGHTING, sAnims_ARCEUS),
@ -15740,6 +16051,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD_FULL(ARCEUS_DARK, sAnims_ARCEUS),
ANIM_CMD_FULL(ARCEUS_FAIRY, sAnims_ARCEUS),
ANIM_CMD_FULL(BASCULIN_BLUE_STRIPED, sAnims_BASCULIN),
ANIM_CMD_FULL(BASCULIN_WHITE_STRIPED, sAnims_BASCULIN),
ANIM_CMD(DARMANITAN_ZEN_MODE),
ANIM_CMD(DARMANITAN_ZEN_MODE_GALARIAN),
ANIM_CMD_FULL(DEERLING_SUMMER, sAnims_DEERLING),
@ -15751,6 +16063,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(TORNADUS_THERIAN),
ANIM_CMD(THUNDURUS_THERIAN),
ANIM_CMD(LANDORUS_THERIAN),
ANIM_CMD(ENAMORUS_THERIAN),
ANIM_CMD(KYUREM_WHITE),
ANIM_CMD(KYUREM_BLACK),
ANIM_CMD(MELOETTA_PIROUETTE),

View File

@ -4499,6 +4499,41 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(48, 64),
.y_offset = 2,
},
[SPECIES_WYRDEER] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_KLEAVOR] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_URSALUNA] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_BASCULEGION] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_SNEASLER] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_OVERQWIL] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ENAMORUS] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Megas
[SPECIES_VENUSAUR_MEGA] =
{
@ -4937,6 +4972,87 @@ const struct MonCoords gMonFrontPicCoords[] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 14,
},
// Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ARCANINE_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_VOLTORB_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ELECTRODE_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_TYPHLOSION_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_QWILFISH_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_SNEASEL_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_SAMUROTT_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_LILLIGANT_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ZORUA_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ZOROARK_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_BRAVIARY_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_SLIGGOO_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_GOODRA_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_AVALUGG_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_DECIDUEYE_HISUIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Misc Forms
// Cosplay Pikachu
@ -5251,7 +5367,17 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(56, 64),
.y_offset = 12,
},
// Giratina
// Origin Forme
[SPECIES_DIALGA_ORIGIN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_PALKIA_ORIGIN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_GIRATINA_ORIGIN] =
{
.size = MON_COORDS_SIZE(64, 64),
@ -5355,6 +5481,11 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(56, 40),
.y_offset = 16,
},
[SPECIES_BASCULIN_WHITE_STRIPED] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Darmanitan
[SPECIES_DARMANITAN_ZEN_MODE] =
{
@ -5414,6 +5545,11 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
[SPECIES_ENAMORUS_THERIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Kyurem
[SPECIES_KYUREM_WHITE] =
{

View File

@ -899,6 +899,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(GLASTRIER, gMonFrontPic_Glastrier),
SPECIES_SPRITE(SPECTRIER, gMonFrontPic_Spectrier),
SPECIES_SPRITE(CALYREX, gMonFrontPic_Calyrex),
SPECIES_SPRITE(WYRDEER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Wyrdeer),
SPECIES_SPRITE(KLEAVOR, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Kleavor),
SPECIES_SPRITE(URSALUNA, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Ursaluna),
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler),
SPECIES_SPRITE(OVERQWIL, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Overqwil),
SPECIES_SPRITE(ENAMORUS, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Enamorus),
SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_VenusaurMega),
SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_CharizardMegaX),
@ -991,6 +998,23 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(YAMASK_GALARIAN, gMonFrontPic_YamaskGalarian),
SPECIES_SPRITE(STUNFISK_GALARIAN, gMonFrontPic_StunfiskGalarian),
SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_GrowlitheHisuian),
SPECIES_SPRITE(ARCANINE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_ArcanineHisuian),
SPECIES_SPRITE(VOLTORB_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_VoltorbHisuian),
SPECIES_SPRITE(ELECTRODE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_ElectrodeHisuian),
SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_TyphlosionHisuian),
SPECIES_SPRITE(QWILFISH_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_QwilfishHisuian),
SPECIES_SPRITE(SNEASEL_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SneaselHisuian),
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SamurottHisuian),
SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_LilligantHisuian),
SPECIES_SPRITE(ZORUA_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_ZoruaHisuian),
SPECIES_SPRITE(ZOROARK_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_ZoroarkHisuian),
SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BraviaryHisuian),
SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SliggooHisuian),
SPECIES_SPRITE(GOODRA_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_GoodraHisuian),
SPECIES_SPRITE(AVALUGG_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_AvaluggHisuian),
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian),
SPECIES_SPRITE(PIKACHU_COSPLAY, gMonFrontPic_PikachuCosplay),
SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonFrontPic_PikachuRockStar),
SPECIES_SPRITE(PIKACHU_BELLE, gMonFrontPic_PikachuBelle),
@ -1063,6 +1087,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(ROTOM_FAN, gMonFrontPic_RotomFan),
SPECIES_SPRITE(ROTOM_MOW, gMonFrontPic_RotomMow),
SPECIES_SPRITE(DIALGA_ORIGIN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DialgaOrigin),
SPECIES_SPRITE(PALKIA_ORIGIN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_PalkiaOrigin),
SPECIES_SPRITE(GIRATINA_ORIGIN, gMonFrontPic_GiratinaOrigin),
SPECIES_SPRITE(SHAYMIN_SKY, gMonFrontPic_ShayminSky),
@ -1086,6 +1112,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(ARCEUS_FAIRY, gMonFrontPic_Arceus),
SPECIES_SPRITE(BASCULIN_BLUE_STRIPED, gMonFrontPic_BasculinBlueStriped),
SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculinWhiteStriped),
SPECIES_SPRITE(DARMANITAN_ZEN_MODE, gMonFrontPic_DarmanitanZenMode),
SPECIES_SPRITE(DARMANITAN_ZEN_MODE_GALARIAN, gMonFrontPic_DarmanitanZenModeGalarian),
@ -1101,6 +1128,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(TORNADUS_THERIAN, gMonFrontPic_TornadusTherian),
SPECIES_SPRITE(THUNDURUS_THERIAN, gMonFrontPic_ThundurusTherian),
SPECIES_SPRITE(LANDORUS_THERIAN, gMonFrontPic_LandorusTherian),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian),
SPECIES_SPRITE(KYUREM_WHITE, gMonFrontPic_KyuremWhite),
SPECIES_SPRITE(KYUREM_BLACK, gMonFrontPic_KyuremBlack),
@ -1292,4 +1320,5 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF),
SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF),
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculegionF),
};

View File

@ -899,6 +899,13 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(GLASTRIER, gMonPalette_Glastrier),
SPECIES_PAL(SPECTRIER, gMonPalette_Spectrier),
SPECIES_PAL(CALYREX, gMonPalette_Calyrex),
SPECIES_PAL(WYRDEER, gMonPalette_CircledQuestionMark), // gMonPalette_Wyrdeer),
SPECIES_PAL(KLEAVOR, gMonPalette_CircledQuestionMark), // gMonPalette_Kleavor),
SPECIES_PAL(URSALUNA, gMonPalette_CircledQuestionMark), // gMonPalette_Ursaluna),
SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_Basculegion),
SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler),
SPECIES_PAL(OVERQWIL, gMonPalette_CircledQuestionMark), // gMonPalette_Overqwil),
SPECIES_PAL(ENAMORUS, gMonPalette_CircledQuestionMark), // gMonPalette_Enamorus),
SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_VenusaurMega),
SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_CharizardMegaX),
@ -991,6 +998,23 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(YAMASK_GALARIAN, gMonPalette_YamaskGalarian),
SPECIES_PAL(STUNFISK_GALARIAN, gMonPalette_StunfiskGalarian),
SPECIES_PAL(GROWLITHE_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_GrowlitheHisuian),
SPECIES_PAL(ARCANINE_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_ArcanineHisuian),
SPECIES_PAL(VOLTORB_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_VoltorbHisuian),
SPECIES_PAL(ELECTRODE_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_ElectrodeHisuian),
SPECIES_PAL(TYPHLOSION_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_TyphlosionHisuian),
SPECIES_PAL(QWILFISH_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_QwilfishHisuian),
SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_SneaselHisuian),
SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_SamurottHisuian),
SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_LilligantHisuian),
SPECIES_PAL(ZORUA_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_ZoruaHisuian),
SPECIES_PAL(ZOROARK_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_ZoroarkHisuian),
SPECIES_PAL(BRAVIARY_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_BraviaryHisuian),
SPECIES_PAL(SLIGGOO_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_SliggooHisuian),
SPECIES_PAL(GOODRA_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_GoodraHisuian),
SPECIES_PAL(AVALUGG_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_AvaluggHisuian),
SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_DecidueyeHisuian),
SPECIES_PAL(PIKACHU_COSPLAY, gMonPalette_PikachuCosplay),
SPECIES_PAL(PIKACHU_ROCK_STAR, gMonPalette_PikachuRockStar),
SPECIES_PAL(PIKACHU_BELLE, gMonPalette_PikachuBelle),
@ -1063,6 +1087,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(ROTOM_FAN, gMonPalette_RotomFan),
SPECIES_PAL(ROTOM_MOW, gMonPalette_RotomMow),
SPECIES_PAL(DIALGA_ORIGIN, gMonPalette_CircledQuestionMark), // gMonPalette_DialgaOrigin),
SPECIES_PAL(PALKIA_ORIGIN, gMonPalette_CircledQuestionMark), // gMonPalette_PalkiaOrigin),
SPECIES_PAL(GIRATINA_ORIGIN, gMonPalette_GiratinaOrigin),
SPECIES_PAL(SHAYMIN_SKY, gMonPalette_ShayminSky),
@ -1086,6 +1112,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(ARCEUS_FAIRY, gMonPalette_ArceusFairy),
SPECIES_PAL(BASCULIN_BLUE_STRIPED, gMonPalette_BasculinBlueStriped),
SPECIES_PAL(BASCULIN_WHITE_STRIPED, gMonPalette_CircledQuestionMark), // gMonPalette_BasculinWhiteStriped),
SPECIES_PAL(DARMANITAN_ZEN_MODE, gMonPalette_DarmanitanZenMode),
SPECIES_PAL(DARMANITAN_ZEN_MODE_GALARIAN, gMonPalette_DarmanitanZenModeGalarian),
@ -1101,6 +1128,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(TORNADUS_THERIAN, gMonPalette_TornadusTherian),
SPECIES_PAL(THUNDURUS_THERIAN, gMonPalette_ThundurusTherian),
SPECIES_PAL(LANDORUS_THERIAN, gMonPalette_LandorusTherian),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian),
SPECIES_PAL(KYUREM_WHITE, gMonPalette_KyuremWhite),
SPECIES_PAL(KYUREM_BLACK, gMonPalette_KyuremBlack),
@ -1292,4 +1320,5 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] =
SPECIES_PAL(FRILLISH, gMonPalette_FrillishF),
SPECIES_PAL(JELLICENT, gMonPalette_JellicentF),
SPECIES_PAL(PYROAR, gMonPalette_PyroarF),
SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF),
};

View File

@ -899,6 +899,13 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(GLASTRIER, gMonShinyPalette_Glastrier),
SPECIES_SHINY_PAL(SPECTRIER, gMonShinyPalette_Spectrier),
SPECIES_SHINY_PAL(CALYREX, gMonShinyPalette_Calyrex),
SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Wyrdeer),
SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Kleavor),
SPECIES_SHINY_PAL(URSALUNA, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Ursaluna),
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Basculegion),
SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Sneasler),
SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Overqwil),
SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Enamorus),
SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega),
SPECIES_SHINY_PAL(CHARIZARD_MEGA_X, gMonShinyPalette_CharizardMegaX),
@ -991,6 +998,23 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(YAMASK_GALARIAN, gMonShinyPalette_YamaskGalarian),
SPECIES_SHINY_PAL(STUNFISK_GALARIAN, gMonShinyPalette_StunfiskGalarian),
SPECIES_SHINY_PAL(GROWLITHE_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_GrowlitheHisuian),
SPECIES_SHINY_PAL(ARCANINE_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_ArcanineHisuian),
SPECIES_SHINY_PAL(VOLTORB_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_VoltorbHisuian),
SPECIES_SHINY_PAL(ELECTRODE_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_ElectrodeHisuian),
SPECIES_SHINY_PAL(TYPHLOSION_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_TyphlosionHisuian),
SPECIES_SHINY_PAL(QWILFISH_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_QwilfishHisuian),
SPECIES_SHINY_PAL(SNEASEL_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_SneaselHisuian),
SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_SamurottHisuian),
SPECIES_SHINY_PAL(LILLIGANT_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_LilligantHisuian),
SPECIES_SHINY_PAL(ZORUA_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_ZoruaHisuian),
SPECIES_SHINY_PAL(ZOROARK_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_ZoroarkHisuian),
SPECIES_SHINY_PAL(BRAVIARY_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BraviaryHisuian),
SPECIES_SHINY_PAL(SLIGGOO_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_SliggooHisuian),
SPECIES_SHINY_PAL(GOODRA_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_GoodraHisuian),
SPECIES_SHINY_PAL(AVALUGG_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_AvaluggHisuian),
SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_DecidueyeHisuian),
SPECIES_SHINY_PAL(PIKACHU_COSPLAY, gMonShinyPalette_PikachuCosplay),
SPECIES_SHINY_PAL(PIKACHU_ROCK_STAR, gMonShinyPalette_PikachuRockStar),
SPECIES_SHINY_PAL(PIKACHU_BELLE, gMonShinyPalette_PikachuBelle),
@ -1063,6 +1087,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(ROTOM_FAN, gMonShinyPalette_RotomFan),
SPECIES_SHINY_PAL(ROTOM_MOW, gMonShinyPalette_RotomMow),
SPECIES_SHINY_PAL(DIALGA_ORIGIN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_DialgaOrigin),
SPECIES_SHINY_PAL(PALKIA_ORIGIN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_PalkiaOrigin),
SPECIES_SHINY_PAL(GIRATINA_ORIGIN, gMonShinyPalette_GiratinaOrigin),
SPECIES_SHINY_PAL(SHAYMIN_SKY, gMonShinyPalette_ShayminSky),
@ -1086,6 +1112,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(ARCEUS_FAIRY, gMonShinyPalette_ArceusFairy),
SPECIES_SHINY_PAL(BASCULIN_BLUE_STRIPED, gMonShinyPalette_BasculinBlueStriped),
SPECIES_SHINY_PAL(BASCULIN_WHITE_STRIPED, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculinWhiteStriped),
SPECIES_SHINY_PAL(DARMANITAN_ZEN_MODE, gMonShinyPalette_DarmanitanZenMode),
SPECIES_SHINY_PAL(DARMANITAN_ZEN_MODE_GALARIAN, gMonShinyPalette_DarmanitanZenModeGalarian),
@ -1101,6 +1128,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(TORNADUS_THERIAN, gMonShinyPalette_TornadusTherian),
SPECIES_SHINY_PAL(THUNDURUS_THERIAN, gMonShinyPalette_ThundurusTherian),
SPECIES_SHINY_PAL(LANDORUS_THERIAN, gMonShinyPalette_LandorusTherian),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_EnamorusTherian),
SPECIES_SHINY_PAL(KYUREM_WHITE, gMonShinyPalette_KyuremWhite),
SPECIES_SHINY_PAL(KYUREM_BLACK, gMonShinyPalette_KyuremBlack),
@ -1292,4 +1320,5 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF),
SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF),
SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF),
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF),
};

View File

@ -898,6 +898,13 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_GLASTRIER] = _("Glastrier"),
[SPECIES_SPECTRIER] = _("Spectrier"),
[SPECIES_CALYREX] = _("Calyrex"),
[SPECIES_WYRDEER] = _("Wyrdeer"),
[SPECIES_KLEAVOR] = _("Kleavor"),
[SPECIES_URSALUNA] = _("Ursaluna"),
[SPECIES_BASCULEGION] = _("Bsculegion"),
[SPECIES_SNEASLER] = _("Sneasler"),
[SPECIES_OVERQWIL] = _("Overqwil"),
[SPECIES_ENAMORUS] = _("Enamorus"),
// Megas
[SPECIES_VENUSAUR_MEGA] = _("Venusaur"),
@ -993,6 +1000,24 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_YAMASK_GALARIAN] = _("Yamask"),
[SPECIES_STUNFISK_GALARIAN] = _("Stunfisk"),
//Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] = _("Growlithe"),
[SPECIES_ARCANINE_HISUIAN] = _("Arcanine"),
[SPECIES_VOLTORB_HISUIAN] = _("Voltorb"),
[SPECIES_ELECTRODE_HISUIAN] = _("Electrode"),
[SPECIES_TYPHLOSION_HISUIAN] = _("Typhlosion"),
[SPECIES_QWILFISH_HISUIAN] = _("Qwilfish"),
[SPECIES_SNEASEL_HISUIAN] = _("Sneasel"),
[SPECIES_SAMUROTT_HISUIAN] = _("Samurott"),
[SPECIES_LILLIGANT_HISUIAN] = _("Lilligant"),
[SPECIES_ZORUA_HISUIAN] = _("Zorua"),
[SPECIES_ZOROARK_HISUIAN] = _("Zoroark"),
[SPECIES_BRAVIARY_HISUIAN] = _("Braviary"),
[SPECIES_SLIGGOO_HISUIAN] = _("Sliggoo"),
[SPECIES_GOODRA_HISUIAN] = _("Goodra"),
[SPECIES_AVALUGG_HISUIAN] = _("Avalugg"),
[SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"),
// Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = _("Pikachu"),
[SPECIES_PIKACHU_ROCK_STAR] = _("Pikachu"),
@ -1065,7 +1090,9 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_ROTOM_FROST] = _("Rotom"),
[SPECIES_ROTOM_MOW] = _("Rotom"),
[SPECIES_ROTOM_WASH] = _("Rotom"),
// Giratina
// Origin
[SPECIES_DIALGA_ORIGIN] = _("Dialga"),
[SPECIES_PALKIA_ORIGIN] = _("Palkia"),
[SPECIES_GIRATINA_ORIGIN] = _("Giratina"),
// Shaymin
[SPECIES_SHAYMIN_SKY] = _("Shaymin"),
@ -1089,6 +1116,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_ARCEUS_FAIRY] = _("Arceus"),
// Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = _("Basculin"),
[SPECIES_BASCULIN_WHITE_STRIPED] = _("Basculin"),
// Darmanitan
[SPECIES_DARMANITAN_ZEN_MODE] = _("Darmanitan"),
[SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = _("Darmanitan"),
@ -1104,6 +1132,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_TORNADUS_THERIAN] = _("Tornadus"),
[SPECIES_THUNDURUS_THERIAN] = _("Thundurus"),
[SPECIES_LANDORUS_THERIAN] = _("Landorus"),
[SPECIES_ENAMORUS_THERIAN] = _("Enamorus"),
// Kyurem
[SPECIES_KYUREM_BLACK] = _("Kyurem"),
[SPECIES_KYUREM_WHITE] = _("Kyurem"),

View File

@ -1218,6 +1218,13 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(GLASTRIER),
SPECIES_TO_NATIONAL(SPECTRIER),
SPECIES_TO_NATIONAL(CALYREX),
SPECIES_TO_NATIONAL(WYRDEER),
SPECIES_TO_NATIONAL(KLEAVOR),
SPECIES_TO_NATIONAL(URSALUNA),
SPECIES_TO_NATIONAL(BASCULEGION),
SPECIES_TO_NATIONAL(SNEASLER),
SPECIES_TO_NATIONAL(OVERQWIL),
SPECIES_TO_NATIONAL(ENAMORUS),
// Megas
[SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR,
@ -1310,6 +1317,23 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_DARMANITAN_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN,
[SPECIES_YAMASK_GALARIAN - 1] = NATIONAL_DEX_YAMASK,
[SPECIES_STUNFISK_GALARIAN - 1] = NATIONAL_DEX_STUNFISK,
//Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN - 1] = NATIONAL_DEX_GROWLITHE,
[SPECIES_ARCANINE_HISUIAN - 1] = NATIONAL_DEX_ARCANINE,
[SPECIES_VOLTORB_HISUIAN - 1] = NATIONAL_DEX_VOLTORB,
[SPECIES_ELECTRODE_HISUIAN - 1] = NATIONAL_DEX_ELECTRODE,
[SPECIES_TYPHLOSION_HISUIAN - 1] = NATIONAL_DEX_TYPHLOSION,
[SPECIES_QWILFISH_HISUIAN - 1] = NATIONAL_DEX_QWILFISH,
[SPECIES_SNEASEL_HISUIAN - 1] = NATIONAL_DEX_SNEASEL,
[SPECIES_SAMUROTT_HISUIAN - 1] = NATIONAL_DEX_SAMUROTT,
[SPECIES_LILLIGANT_HISUIAN - 1] = NATIONAL_DEX_LILLIGANT,
[SPECIES_ZORUA_HISUIAN - 1] = NATIONAL_DEX_ZORUA,
[SPECIES_ZOROARK_HISUIAN - 1] = NATIONAL_DEX_ZOROARK,
[SPECIES_BRAVIARY_HISUIAN - 1] = NATIONAL_DEX_BRAVIARY,
[SPECIES_SLIGGOO_HISUIAN - 1] = NATIONAL_DEX_SLIGGOO,
[SPECIES_GOODRA_HISUIAN - 1] = NATIONAL_DEX_GOODRA,
[SPECIES_AVALUGG_HISUIAN - 1] = NATIONAL_DEX_AVALUGG,
[SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE,
// Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU,
[SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU,
@ -1382,7 +1406,9 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_ROTOM_FROST - 1] = NATIONAL_DEX_ROTOM,
[SPECIES_ROTOM_FAN - 1] = NATIONAL_DEX_ROTOM,
[SPECIES_ROTOM_MOW - 1] = NATIONAL_DEX_ROTOM,
// Giratina
// Origin
[SPECIES_DIALGA_ORIGIN - 1] = NATIONAL_DEX_DIALGA,
[SPECIES_PALKIA_ORIGIN - 1] = NATIONAL_DEX_PALKIA,
[SPECIES_GIRATINA_ORIGIN - 1] = NATIONAL_DEX_GIRATINA,
// Shaymin
[SPECIES_SHAYMIN_SKY - 1] = NATIONAL_DEX_SHAYMIN,
@ -1406,6 +1432,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_ARCEUS_FAIRY - 1] = NATIONAL_DEX_ARCEUS,
// Basculin
[SPECIES_BASCULIN_BLUE_STRIPED - 1] = NATIONAL_DEX_BASCULIN,
[SPECIES_BASCULIN_WHITE_STRIPED - 1] = NATIONAL_DEX_BASCULIN,
// Darmanitan
[SPECIES_DARMANITAN_ZEN_MODE - 1] = NATIONAL_DEX_DARMANITAN,
[SPECIES_DARMANITAN_ZEN_MODE_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN,
@ -1421,6 +1448,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_TORNADUS_THERIAN - 1] = NATIONAL_DEX_TORNADUS,
[SPECIES_THUNDURUS_THERIAN - 1] = NATIONAL_DEX_THUNDURUS,
[SPECIES_LANDORUS_THERIAN - 1] = NATIONAL_DEX_LANDORUS,
[SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS,
// Kyurem
[SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM,
[SPECIES_KYUREM_WHITE - 1] = NATIONAL_DEX_KYUREM,
@ -2776,6 +2804,13 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_GLASTRIER - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_SPECTRIER - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_CALYREX - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_WYRDEER - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_KLEAVOR - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_URSALUNA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_BASCULEGION - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_SNEASLER - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OVERQWIL - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_ENAMORUS - 1] = ANIM_V_SQUISH_AND_BOUNCE,
// Forms
[SPECIES_ROTOM_HEAT - 1] = ANIM_V_SQUISH_AND_BOUNCE,

View File

@ -928,7 +928,14 @@ const u8 *const gMonIconTable[] =
[SPECIES_REGIDRAGO] = gMonIcon_Regidrago,
[SPECIES_GLASTRIER] = gMonIcon_Glastrier,
[SPECIES_SPECTRIER] = gMonIcon_Spectrier,
[SPECIES_CALYREX] = gMonIcon_QuestionMark,//gMonIcon_Calyrex,
[SPECIES_CALYREX] = gMonIcon_Calyrex,
[SPECIES_WYRDEER] = gMonIcon_Wyrdeer,
[SPECIES_KLEAVOR] = gMonIcon_Kleavor,
[SPECIES_URSALUNA] = gMonIcon_Ursaluna,
[SPECIES_BASCULEGION] = gMonIcon_Basculegion,
[SPECIES_SNEASLER] = gMonIcon_Sneasler,
[SPECIES_OVERQWIL] = gMonIcon_Overqwil,
[SPECIES_ENAMORUS] = gMonIcon_Enamorus,
[SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega,
[SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX,
[SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY,
@ -1016,6 +1023,22 @@ const u8 *const gMonIconTable[] =
[SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian,
[SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian,
[SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian,
[SPECIES_GROWLITHE_HISUIAN] = gMonIcon_GrowlitheHisuian,
[SPECIES_ARCANINE_HISUIAN] = gMonIcon_ArcanineHisuian,
[SPECIES_VOLTORB_HISUIAN] = gMonIcon_VoltorbHisuian,
[SPECIES_ELECTRODE_HISUIAN] = gMonIcon_ElectrodeHisuian,
[SPECIES_TYPHLOSION_HISUIAN] = gMonIcon_TyphlosionHisuian,
[SPECIES_QWILFISH_HISUIAN] = gMonIcon_QwilfishHisuian,
[SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian,
[SPECIES_SAMUROTT_HISUIAN] = gMonIcon_SamurottHisuian,
[SPECIES_LILLIGANT_HISUIAN] = gMonIcon_LilligantHisuian,
[SPECIES_ZORUA_HISUIAN] = gMonIcon_ZoruaHisuian,
[SPECIES_ZOROARK_HISUIAN] = gMonIcon_ZoroarkHisuian,
[SPECIES_BRAVIARY_HISUIAN] = gMonIcon_BraviaryHisuian,
[SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian,
[SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian,
[SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian,
[SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian,
[SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay,
[SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar,
[SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle,
@ -1076,6 +1099,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_ROTOM_FROST] = gMonIcon_RotomFrost,
[SPECIES_ROTOM_FAN] = gMonIcon_RotomFan,
[SPECIES_ROTOM_MOW] = gMonIcon_RotomMow,
[SPECIES_DIALGA_ORIGIN] = gMonIcon_DialgaOrigin,
[SPECIES_PALKIA_ORIGIN] = gMonIcon_PalkiaOrigin,
[SPECIES_GIRATINA_ORIGIN] = gMonIcon_GiratinaOrigin,
[SPECIES_SHAYMIN_SKY] = gMonIcon_ShayminSky,
[SPECIES_ARCEUS_FIGHTING] = gMonIcon_Arceus,
@ -1096,6 +1121,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_ARCEUS_DARK] = gMonIcon_Arceus,
[SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus,
[SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped,
[SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped,
[SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode,
[SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_DarmanitanZenModeGalarian,
[SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer,
@ -1107,6 +1133,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_TORNADUS_THERIAN] = gMonIcon_TornadusTherian,
[SPECIES_THUNDURUS_THERIAN] = gMonIcon_ThundurusTherian,
[SPECIES_LANDORUS_THERIAN] = gMonIcon_LandorusTherian,
[SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian,
[SPECIES_KYUREM_WHITE] = gMonIcon_KyuremWhite,
[SPECIES_KYUREM_BLACK] = gMonIcon_KyuremBlack,
[SPECIES_KELDEO_RESOLUTE] = gMonIcon_KeldeoResolute,
@ -1257,6 +1284,7 @@ const u8 *const gMonIconTableFemale[] =
[SPECIES_FRILLISH] = gMonIcon_FrillishF,
[SPECIES_JELLICENT] = gMonIcon_JellicentF,
[SPECIES_PYROAR] = gMonIcon_PyroarF,
[SPECIES_BASCULEGION] = gMonIcon_BasculegionF,
};
const u8 gMonIconPaletteIndices[] =
@ -2159,6 +2187,13 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_GLASTRIER] = 0,
[SPECIES_SPECTRIER] = 0,
[SPECIES_CALYREX] = 0,
[SPECIES_WYRDEER] = 2,
[SPECIES_KLEAVOR] = 2,
[SPECIES_URSALUNA] = 2,
[SPECIES_BASCULEGION] = 1,
[SPECIES_SNEASLER] = 2,
[SPECIES_OVERQWIL] = 2,
[SPECIES_ENAMORUS] = 1,
[SPECIES_VENUSAUR_MEGA] = 1,
[SPECIES_CHARIZARD_MEGA_X] = 0,
[SPECIES_CHARIZARD_MEGA_Y] = 0,
@ -2246,6 +2281,22 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_DARMANITAN_GALARIAN] = 0,
[SPECIES_YAMASK_GALARIAN] = 2,
[SPECIES_STUNFISK_GALARIAN] = 1,
[SPECIES_GROWLITHE_HISUIAN] = 0,
[SPECIES_ARCANINE_HISUIAN] = 0,
[SPECIES_VOLTORB_HISUIAN] = 0,
[SPECIES_ELECTRODE_HISUIAN] = 1,
[SPECIES_TYPHLOSION_HISUIAN] = 1,
[SPECIES_QWILFISH_HISUIAN] = 0,
[SPECIES_SNEASEL_HISUIAN] = 2,
[SPECIES_SAMUROTT_HISUIAN] = 0,
[SPECIES_LILLIGANT_HISUIAN] = 1,
[SPECIES_ZORUA_HISUIAN] = 0,
[SPECIES_ZOROARK_HISUIAN] = 0,
[SPECIES_BRAVIARY_HISUIAN] = 2,
[SPECIES_SLIGGOO_HISUIAN] = 2,
[SPECIES_GOODRA_HISUIAN] = 2,
[SPECIES_AVALUGG_HISUIAN] = 5,
[SPECIES_DECIDUEYE_HISUIAN] = 0,
[SPECIES_PIKACHU_COSPLAY] = 2,
[SPECIES_PIKACHU_ROCK_STAR] = 1,
[SPECIES_PIKACHU_BELLE] = 0,
@ -2277,6 +2328,8 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ROTOM_FROST] = 5,
[SPECIES_ROTOM_FAN] = 0,
[SPECIES_ROTOM_MOW] = 0,
[SPECIES_DIALGA_ORIGIN] = 0,
[SPECIES_PALKIA_ORIGIN] = 2,
[SPECIES_GIRATINA_ORIGIN] = 0,
[SPECIES_SHAYMIN_SKY] = 1,
[SPECIES_ARCEUS_FIGHTING] = 1,
@ -2297,6 +2350,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ARCEUS_DARK] = 1,
[SPECIES_ARCEUS_FAIRY] = 1,
[SPECIES_BASCULIN_BLUE_STRIPED] = 0,
[SPECIES_BASCULIN_WHITE_STRIPED] = 0,
[SPECIES_DARMANITAN_ZEN_MODE] = 0,
[SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = 0,
[SPECIES_DEERLING_SUMMER] = 1,
@ -2308,6 +2362,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_TORNADUS_THERIAN] = 1,
[SPECIES_THUNDURUS_THERIAN] = 0,
[SPECIES_LANDORUS_THERIAN] = 0,
[SPECIES_ENAMORUS_THERIAN] = 1,
[SPECIES_KYUREM_WHITE] = 0,
[SPECIES_KYUREM_BLACK] = 0,
[SPECIES_KELDEO_RESOLUTE] = 0,
@ -2451,6 +2506,7 @@ const u8 gMonIconPaletteIndicesFemale[] =
[SPECIES_FRILLISH] = 1,
[SPECIES_JELLICENT] = 1,
[SPECIES_PYROAR] = 2,
[SPECIES_BASCULEGION] = 0,
};
const struct SpritePalette gMonIconPaletteTable[] =