diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 37ec617b5e..ca6f73e908 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1050,7 +1050,7 @@ BattleScript_EffectPhotonGeyser: goto BattleScript_MoveEnd BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko - jumpifspecies BS_ATTACKER, SPECIES_MORPEKO, BattleScript_EffectSpeedUpHit + jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_FULL_BELLY, BattleScript_EffectSpeedUpHit jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectSpeedUpHit goto BattleScript_PokemonCantUseTheMove @@ -1163,7 +1163,7 @@ BattleScript_BothCanNoLongerEscape:: BattleScript_EffectHyperspaceFury: jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound - jumpifspecies BS_ATTACKER, SPECIES_HOOPA, BattleScript_ButHoopaCantUseIt + jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt goto BattleScript_PokemonCantUseTheMove BattleScript_EffectHyperspaceFuryUnbound:: diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index d2174eee99..644001c6e7 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -81,11 +81,11 @@ BirthIsland_Exterior_EventScript_Deoxys:: applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach waitmovement 0 waitse - playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER + playmoncry SPECIES_DEOXYS_NORMAL, CRY_MODE_ENCOUNTER delay 40 waitmoncry setvar VAR_LAST_TALKED, LOCALID_DEOXYS - seteventmon SPECIES_DEOXYS, 30 + seteventmon SPECIES_DEOXYS_NORMAL, 30 setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate @@ -100,12 +100,12 @@ BirthIsland_Exterior_EventScript_Deoxys:: BirthIsland_Exterior_EventScript_DefeatedDeoxys:: setflag FLAG_DEFEATED_DEOXYS - setvar VAR_0x8004, SPECIES_DEOXYS + setvar VAR_0x8004, SPECIES_DEOXYS_NORMAL goto Common_EventScript_LegendaryFlewAway end BirthIsland_Exterior_EventScript_RanFromDeoxys:: - setvar VAR_0x8004, SPECIES_DEOXYS + setvar VAR_0x8004, SPECIES_DEOXYS_NORMAL goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index e5df03d4a1..2dfec9bffe 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -88,8 +88,8 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: Route119_WeatherInstitute_2F_EventScript_ReceiveCastform:: msgbox Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon, MSGBOX_DEFAULT - setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_CASTFORM - givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER + setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_CASTFORM_NORMAL + givemon SPECIES_CASTFORM_NORMAL, 25, ITEM_MYSTIC_WATER goto_if_eq VAR_RESULT, MON_GIVEN_TO_PARTY, Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty goto_if_eq VAR_RESULT, MON_GIVEN_TO_PC, Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC goto Common_EventScript_NoMoreRoomForPokemon @@ -122,7 +122,7 @@ Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform waitmessage waitfanfare - bufferspeciesname STR_VAR_1, SPECIES_CASTFORM + bufferspeciesname STR_VAR_1, SPECIES_CASTFORM_NORMAL return Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: diff --git a/graphics/pokemon/cherrim/normal/anim_front.png b/graphics/pokemon/cherrim/anim_front.png similarity index 100% rename from graphics/pokemon/cherrim/normal/anim_front.png rename to graphics/pokemon/cherrim/anim_front.png diff --git a/graphics/pokemon/cherrim/normal/back.png b/graphics/pokemon/cherrim/back.png similarity index 100% rename from graphics/pokemon/cherrim/normal/back.png rename to graphics/pokemon/cherrim/back.png diff --git a/graphics/pokemon/cherrim/normal/normal.pal b/graphics/pokemon/cherrim/normal.pal similarity index 100% rename from graphics/pokemon/cherrim/normal/normal.pal rename to graphics/pokemon/cherrim/normal.pal diff --git a/graphics/pokemon/cherrim/normal/shiny.pal b/graphics/pokemon/cherrim/shiny.pal similarity index 100% rename from graphics/pokemon/cherrim/normal/shiny.pal rename to graphics/pokemon/cherrim/shiny.pal diff --git a/include/constants/species.h b/include/constants/species.h index 02b017655f..a54121f626 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1,912 +1,965 @@ #ifndef GUARD_CONSTANTS_SPECIES_H #define GUARD_CONSTANTS_SPECIES_H -#define SPECIES_NONE 0 -#define SPECIES_BULBASAUR 1 -#define SPECIES_IVYSAUR 2 -#define SPECIES_VENUSAUR 3 -#define SPECIES_CHARMANDER 4 -#define SPECIES_CHARMELEON 5 -#define SPECIES_CHARIZARD 6 -#define SPECIES_SQUIRTLE 7 -#define SPECIES_WARTORTLE 8 -#define SPECIES_BLASTOISE 9 -#define SPECIES_CATERPIE 10 -#define SPECIES_METAPOD 11 -#define SPECIES_BUTTERFREE 12 -#define SPECIES_WEEDLE 13 -#define SPECIES_KAKUNA 14 -#define SPECIES_BEEDRILL 15 -#define SPECIES_PIDGEY 16 -#define SPECIES_PIDGEOTTO 17 -#define SPECIES_PIDGEOT 18 -#define SPECIES_RATTATA 19 -#define SPECIES_RATICATE 20 -#define SPECIES_SPEAROW 21 -#define SPECIES_FEAROW 22 -#define SPECIES_EKANS 23 -#define SPECIES_ARBOK 24 -#define SPECIES_PIKACHU 25 -#define SPECIES_RAICHU 26 -#define SPECIES_SANDSHREW 27 -#define SPECIES_SANDSLASH 28 -#define SPECIES_NIDORAN_F 29 -#define SPECIES_NIDORINA 30 -#define SPECIES_NIDOQUEEN 31 -#define SPECIES_NIDORAN_M 32 -#define SPECIES_NIDORINO 33 -#define SPECIES_NIDOKING 34 -#define SPECIES_CLEFAIRY 35 -#define SPECIES_CLEFABLE 36 -#define SPECIES_VULPIX 37 -#define SPECIES_NINETALES 38 -#define SPECIES_JIGGLYPUFF 39 -#define SPECIES_WIGGLYTUFF 40 -#define SPECIES_ZUBAT 41 -#define SPECIES_GOLBAT 42 -#define SPECIES_ODDISH 43 -#define SPECIES_GLOOM 44 -#define SPECIES_VILEPLUME 45 -#define SPECIES_PARAS 46 -#define SPECIES_PARASECT 47 -#define SPECIES_VENONAT 48 -#define SPECIES_VENOMOTH 49 -#define SPECIES_DIGLETT 50 -#define SPECIES_DUGTRIO 51 -#define SPECIES_MEOWTH 52 -#define SPECIES_PERSIAN 53 -#define SPECIES_PSYDUCK 54 -#define SPECIES_GOLDUCK 55 -#define SPECIES_MANKEY 56 -#define SPECIES_PRIMEAPE 57 -#define SPECIES_GROWLITHE 58 -#define SPECIES_ARCANINE 59 -#define SPECIES_POLIWAG 60 -#define SPECIES_POLIWHIRL 61 -#define SPECIES_POLIWRATH 62 -#define SPECIES_ABRA 63 -#define SPECIES_KADABRA 64 -#define SPECIES_ALAKAZAM 65 -#define SPECIES_MACHOP 66 -#define SPECIES_MACHOKE 67 -#define SPECIES_MACHAMP 68 -#define SPECIES_BELLSPROUT 69 -#define SPECIES_WEEPINBELL 70 -#define SPECIES_VICTREEBEL 71 -#define SPECIES_TENTACOOL 72 -#define SPECIES_TENTACRUEL 73 -#define SPECIES_GEODUDE 74 -#define SPECIES_GRAVELER 75 -#define SPECIES_GOLEM 76 -#define SPECIES_PONYTA 77 -#define SPECIES_RAPIDASH 78 -#define SPECIES_SLOWPOKE 79 -#define SPECIES_SLOWBRO 80 -#define SPECIES_MAGNEMITE 81 -#define SPECIES_MAGNETON 82 -#define SPECIES_FARFETCHD 83 -#define SPECIES_DODUO 84 -#define SPECIES_DODRIO 85 -#define SPECIES_SEEL 86 -#define SPECIES_DEWGONG 87 -#define SPECIES_GRIMER 88 -#define SPECIES_MUK 89 -#define SPECIES_SHELLDER 90 -#define SPECIES_CLOYSTER 91 -#define SPECIES_GASTLY 92 -#define SPECIES_HAUNTER 93 -#define SPECIES_GENGAR 94 -#define SPECIES_ONIX 95 -#define SPECIES_DROWZEE 96 -#define SPECIES_HYPNO 97 -#define SPECIES_KRABBY 98 -#define SPECIES_KINGLER 99 -#define SPECIES_VOLTORB 100 -#define SPECIES_ELECTRODE 101 -#define SPECIES_EXEGGCUTE 102 -#define SPECIES_EXEGGUTOR 103 -#define SPECIES_CUBONE 104 -#define SPECIES_MAROWAK 105 -#define SPECIES_HITMONLEE 106 -#define SPECIES_HITMONCHAN 107 -#define SPECIES_LICKITUNG 108 -#define SPECIES_KOFFING 109 -#define SPECIES_WEEZING 110 -#define SPECIES_RHYHORN 111 -#define SPECIES_RHYDON 112 -#define SPECIES_CHANSEY 113 -#define SPECIES_TANGELA 114 -#define SPECIES_KANGASKHAN 115 -#define SPECIES_HORSEA 116 -#define SPECIES_SEADRA 117 -#define SPECIES_GOLDEEN 118 -#define SPECIES_SEAKING 119 -#define SPECIES_STARYU 120 -#define SPECIES_STARMIE 121 -#define SPECIES_MR_MIME 122 -#define SPECIES_SCYTHER 123 -#define SPECIES_JYNX 124 -#define SPECIES_ELECTABUZZ 125 -#define SPECIES_MAGMAR 126 -#define SPECIES_PINSIR 127 -#define SPECIES_TAUROS 128 -#define SPECIES_MAGIKARP 129 -#define SPECIES_GYARADOS 130 -#define SPECIES_LAPRAS 131 -#define SPECIES_DITTO 132 -#define SPECIES_EEVEE 133 -#define SPECIES_VAPOREON 134 -#define SPECIES_JOLTEON 135 -#define SPECIES_FLAREON 136 -#define SPECIES_PORYGON 137 -#define SPECIES_OMANYTE 138 -#define SPECIES_OMASTAR 139 -#define SPECIES_KABUTO 140 -#define SPECIES_KABUTOPS 141 -#define SPECIES_AERODACTYL 142 -#define SPECIES_SNORLAX 143 -#define SPECIES_ARTICUNO 144 -#define SPECIES_ZAPDOS 145 -#define SPECIES_MOLTRES 146 -#define SPECIES_DRATINI 147 -#define SPECIES_DRAGONAIR 148 -#define SPECIES_DRAGONITE 149 -#define SPECIES_MEWTWO 150 -#define SPECIES_MEW 151 -#define SPECIES_CHIKORITA 152 -#define SPECIES_BAYLEEF 153 -#define SPECIES_MEGANIUM 154 -#define SPECIES_CYNDAQUIL 155 -#define SPECIES_QUILAVA 156 -#define SPECIES_TYPHLOSION 157 -#define SPECIES_TOTODILE 158 -#define SPECIES_CROCONAW 159 -#define SPECIES_FERALIGATR 160 -#define SPECIES_SENTRET 161 -#define SPECIES_FURRET 162 -#define SPECIES_HOOTHOOT 163 -#define SPECIES_NOCTOWL 164 -#define SPECIES_LEDYBA 165 -#define SPECIES_LEDIAN 166 -#define SPECIES_SPINARAK 167 -#define SPECIES_ARIADOS 168 -#define SPECIES_CROBAT 169 -#define SPECIES_CHINCHOU 170 -#define SPECIES_LANTURN 171 -#define SPECIES_PICHU 172 -#define SPECIES_CLEFFA 173 -#define SPECIES_IGGLYBUFF 174 -#define SPECIES_TOGEPI 175 -#define SPECIES_TOGETIC 176 -#define SPECIES_NATU 177 -#define SPECIES_XATU 178 -#define SPECIES_MAREEP 179 -#define SPECIES_FLAAFFY 180 -#define SPECIES_AMPHAROS 181 -#define SPECIES_BELLOSSOM 182 -#define SPECIES_MARILL 183 -#define SPECIES_AZUMARILL 184 -#define SPECIES_SUDOWOODO 185 -#define SPECIES_POLITOED 186 -#define SPECIES_HOPPIP 187 -#define SPECIES_SKIPLOOM 188 -#define SPECIES_JUMPLUFF 189 -#define SPECIES_AIPOM 190 -#define SPECIES_SUNKERN 191 -#define SPECIES_SUNFLORA 192 -#define SPECIES_YANMA 193 -#define SPECIES_WOOPER 194 -#define SPECIES_QUAGSIRE 195 -#define SPECIES_ESPEON 196 -#define SPECIES_UMBREON 197 -#define SPECIES_MURKROW 198 -#define SPECIES_SLOWKING 199 -#define SPECIES_MISDREAVUS 200 -#define SPECIES_UNOWN 201 -#define SPECIES_WOBBUFFET 202 -#define SPECIES_GIRAFARIG 203 -#define SPECIES_PINECO 204 -#define SPECIES_FORRETRESS 205 -#define SPECIES_DUNSPARCE 206 -#define SPECIES_GLIGAR 207 -#define SPECIES_STEELIX 208 -#define SPECIES_SNUBBULL 209 -#define SPECIES_GRANBULL 210 -#define SPECIES_QWILFISH 211 -#define SPECIES_SCIZOR 212 -#define SPECIES_SHUCKLE 213 -#define SPECIES_HERACROSS 214 -#define SPECIES_SNEASEL 215 -#define SPECIES_TEDDIURSA 216 -#define SPECIES_URSARING 217 -#define SPECIES_SLUGMA 218 -#define SPECIES_MAGCARGO 219 -#define SPECIES_SWINUB 220 -#define SPECIES_PILOSWINE 221 -#define SPECIES_CORSOLA 222 -#define SPECIES_REMORAID 223 -#define SPECIES_OCTILLERY 224 -#define SPECIES_DELIBIRD 225 -#define SPECIES_MANTINE 226 -#define SPECIES_SKARMORY 227 -#define SPECIES_HOUNDOUR 228 -#define SPECIES_HOUNDOOM 229 -#define SPECIES_KINGDRA 230 -#define SPECIES_PHANPY 231 -#define SPECIES_DONPHAN 232 -#define SPECIES_PORYGON2 233 -#define SPECIES_STANTLER 234 -#define SPECIES_SMEARGLE 235 -#define SPECIES_TYROGUE 236 -#define SPECIES_HITMONTOP 237 -#define SPECIES_SMOOCHUM 238 -#define SPECIES_ELEKID 239 -#define SPECIES_MAGBY 240 -#define SPECIES_MILTANK 241 -#define SPECIES_BLISSEY 242 -#define SPECIES_RAIKOU 243 -#define SPECIES_ENTEI 244 -#define SPECIES_SUICUNE 245 -#define SPECIES_LARVITAR 246 -#define SPECIES_PUPITAR 247 -#define SPECIES_TYRANITAR 248 -#define SPECIES_LUGIA 249 -#define SPECIES_HO_OH 250 -#define SPECIES_CELEBI 251 -#define SPECIES_TREECKO 252 -#define SPECIES_GROVYLE 253 -#define SPECIES_SCEPTILE 254 -#define SPECIES_TORCHIC 255 -#define SPECIES_COMBUSKEN 256 -#define SPECIES_BLAZIKEN 257 -#define SPECIES_MUDKIP 258 -#define SPECIES_MARSHTOMP 259 -#define SPECIES_SWAMPERT 260 -#define SPECIES_POOCHYENA 261 -#define SPECIES_MIGHTYENA 262 -#define SPECIES_ZIGZAGOON 263 -#define SPECIES_LINOONE 264 -#define SPECIES_WURMPLE 265 -#define SPECIES_SILCOON 266 -#define SPECIES_BEAUTIFLY 267 -#define SPECIES_CASCOON 268 -#define SPECIES_DUSTOX 269 -#define SPECIES_LOTAD 270 -#define SPECIES_LOMBRE 271 -#define SPECIES_LUDICOLO 272 -#define SPECIES_SEEDOT 273 -#define SPECIES_NUZLEAF 274 -#define SPECIES_SHIFTRY 275 -#define SPECIES_TAILLOW 276 -#define SPECIES_SWELLOW 277 -#define SPECIES_WINGULL 278 -#define SPECIES_PELIPPER 279 -#define SPECIES_RALTS 280 -#define SPECIES_KIRLIA 281 -#define SPECIES_GARDEVOIR 282 -#define SPECIES_SURSKIT 283 -#define SPECIES_MASQUERAIN 284 -#define SPECIES_SHROOMISH 285 -#define SPECIES_BRELOOM 286 -#define SPECIES_SLAKOTH 287 -#define SPECIES_VIGOROTH 288 -#define SPECIES_SLAKING 289 -#define SPECIES_NINCADA 290 -#define SPECIES_NINJASK 291 -#define SPECIES_SHEDINJA 292 -#define SPECIES_WHISMUR 293 -#define SPECIES_LOUDRED 294 -#define SPECIES_EXPLOUD 295 -#define SPECIES_MAKUHITA 296 -#define SPECIES_HARIYAMA 297 -#define SPECIES_AZURILL 298 -#define SPECIES_NOSEPASS 299 -#define SPECIES_SKITTY 300 -#define SPECIES_DELCATTY 301 -#define SPECIES_SABLEYE 302 -#define SPECIES_MAWILE 303 -#define SPECIES_ARON 304 -#define SPECIES_LAIRON 305 -#define SPECIES_AGGRON 306 -#define SPECIES_MEDITITE 307 -#define SPECIES_MEDICHAM 308 -#define SPECIES_ELECTRIKE 309 -#define SPECIES_MANECTRIC 310 -#define SPECIES_PLUSLE 311 -#define SPECIES_MINUN 312 -#define SPECIES_VOLBEAT 313 -#define SPECIES_ILLUMISE 314 -#define SPECIES_ROSELIA 315 -#define SPECIES_GULPIN 316 -#define SPECIES_SWALOT 317 -#define SPECIES_CARVANHA 318 -#define SPECIES_SHARPEDO 319 -#define SPECIES_WAILMER 320 -#define SPECIES_WAILORD 321 -#define SPECIES_NUMEL 322 -#define SPECIES_CAMERUPT 323 -#define SPECIES_TORKOAL 324 -#define SPECIES_SPOINK 325 -#define SPECIES_GRUMPIG 326 -#define SPECIES_SPINDA 327 -#define SPECIES_TRAPINCH 328 -#define SPECIES_VIBRAVA 329 -#define SPECIES_FLYGON 330 -#define SPECIES_CACNEA 331 -#define SPECIES_CACTURNE 332 -#define SPECIES_SWABLU 333 -#define SPECIES_ALTARIA 334 -#define SPECIES_ZANGOOSE 335 -#define SPECIES_SEVIPER 336 -#define SPECIES_LUNATONE 337 -#define SPECIES_SOLROCK 338 -#define SPECIES_BARBOACH 339 -#define SPECIES_WHISCASH 340 -#define SPECIES_CORPHISH 341 -#define SPECIES_CRAWDAUNT 342 -#define SPECIES_BALTOY 343 -#define SPECIES_CLAYDOL 344 -#define SPECIES_LILEEP 345 -#define SPECIES_CRADILY 346 -#define SPECIES_ANORITH 347 -#define SPECIES_ARMALDO 348 -#define SPECIES_FEEBAS 349 -#define SPECIES_MILOTIC 350 -#define SPECIES_CASTFORM 351 -#define SPECIES_KECLEON 352 -#define SPECIES_SHUPPET 353 -#define SPECIES_BANETTE 354 -#define SPECIES_DUSKULL 355 -#define SPECIES_DUSCLOPS 356 -#define SPECIES_TROPIUS 357 -#define SPECIES_CHIMECHO 358 -#define SPECIES_ABSOL 359 -#define SPECIES_WYNAUT 360 -#define SPECIES_SNORUNT 361 -#define SPECIES_GLALIE 362 -#define SPECIES_SPHEAL 363 -#define SPECIES_SEALEO 364 -#define SPECIES_WALREIN 365 -#define SPECIES_CLAMPERL 366 -#define SPECIES_HUNTAIL 367 -#define SPECIES_GOREBYSS 368 -#define SPECIES_RELICANTH 369 -#define SPECIES_LUVDISC 370 -#define SPECIES_BAGON 371 -#define SPECIES_SHELGON 372 -#define SPECIES_SALAMENCE 373 -#define SPECIES_BELDUM 374 -#define SPECIES_METANG 375 -#define SPECIES_METAGROSS 376 -#define SPECIES_REGIROCK 377 -#define SPECIES_REGICE 378 -#define SPECIES_REGISTEEL 379 -#define SPECIES_LATIAS 380 -#define SPECIES_LATIOS 381 -#define SPECIES_KYOGRE 382 -#define SPECIES_GROUDON 383 -#define SPECIES_RAYQUAZA 384 -#define SPECIES_JIRACHI 385 -#define SPECIES_DEOXYS 386 -#define SPECIES_TURTWIG 387 -#define SPECIES_GROTLE 388 -#define SPECIES_TORTERRA 389 -#define SPECIES_CHIMCHAR 390 -#define SPECIES_MONFERNO 391 -#define SPECIES_INFERNAPE 392 -#define SPECIES_PIPLUP 393 -#define SPECIES_PRINPLUP 394 -#define SPECIES_EMPOLEON 395 -#define SPECIES_STARLY 396 -#define SPECIES_STARAVIA 397 -#define SPECIES_STARAPTOR 398 -#define SPECIES_BIDOOF 399 -#define SPECIES_BIBAREL 400 -#define SPECIES_KRICKETOT 401 -#define SPECIES_KRICKETUNE 402 -#define SPECIES_SHINX 403 -#define SPECIES_LUXIO 404 -#define SPECIES_LUXRAY 405 -#define SPECIES_BUDEW 406 -#define SPECIES_ROSERADE 407 -#define SPECIES_CRANIDOS 408 -#define SPECIES_RAMPARDOS 409 -#define SPECIES_SHIELDON 410 -#define SPECIES_BASTIODON 411 -#define SPECIES_BURMY 412 -#define SPECIES_WORMADAM 413 -#define SPECIES_MOTHIM 414 -#define SPECIES_COMBEE 415 -#define SPECIES_VESPIQUEN 416 -#define SPECIES_PACHIRISU 417 -#define SPECIES_BUIZEL 418 -#define SPECIES_FLOATZEL 419 -#define SPECIES_CHERUBI 420 -#define SPECIES_CHERRIM 421 -#define SPECIES_SHELLOS 422 -#define SPECIES_GASTRODON 423 -#define SPECIES_AMBIPOM 424 -#define SPECIES_DRIFLOON 425 -#define SPECIES_DRIFBLIM 426 -#define SPECIES_BUNEARY 427 -#define SPECIES_LOPUNNY 428 -#define SPECIES_MISMAGIUS 429 -#define SPECIES_HONCHKROW 430 -#define SPECIES_GLAMEOW 431 -#define SPECIES_PURUGLY 432 -#define SPECIES_CHINGLING 433 -#define SPECIES_STUNKY 434 -#define SPECIES_SKUNTANK 435 -#define SPECIES_BRONZOR 436 -#define SPECIES_BRONZONG 437 -#define SPECIES_BONSLY 438 -#define SPECIES_MIME_JR 439 -#define SPECIES_HAPPINY 440 -#define SPECIES_CHATOT 441 -#define SPECIES_SPIRITOMB 442 -#define SPECIES_GIBLE 443 -#define SPECIES_GABITE 444 -#define SPECIES_GARCHOMP 445 -#define SPECIES_MUNCHLAX 446 -#define SPECIES_RIOLU 447 -#define SPECIES_LUCARIO 448 -#define SPECIES_HIPPOPOTAS 449 -#define SPECIES_HIPPOWDON 450 -#define SPECIES_SKORUPI 451 -#define SPECIES_DRAPION 452 -#define SPECIES_CROAGUNK 453 -#define SPECIES_TOXICROAK 454 -#define SPECIES_CARNIVINE 455 -#define SPECIES_FINNEON 456 -#define SPECIES_LUMINEON 457 -#define SPECIES_MANTYKE 458 -#define SPECIES_SNOVER 459 -#define SPECIES_ABOMASNOW 460 -#define SPECIES_WEAVILE 461 -#define SPECIES_MAGNEZONE 462 -#define SPECIES_LICKILICKY 463 -#define SPECIES_RHYPERIOR 464 -#define SPECIES_TANGROWTH 465 -#define SPECIES_ELECTIVIRE 466 -#define SPECIES_MAGMORTAR 467 -#define SPECIES_TOGEKISS 468 -#define SPECIES_YANMEGA 469 -#define SPECIES_LEAFEON 470 -#define SPECIES_GLACEON 471 -#define SPECIES_GLISCOR 472 -#define SPECIES_MAMOSWINE 473 -#define SPECIES_PORYGON_Z 474 -#define SPECIES_GALLADE 475 -#define SPECIES_PROBOPASS 476 -#define SPECIES_DUSKNOIR 477 -#define SPECIES_FROSLASS 478 -#define SPECIES_ROTOM 479 -#define SPECIES_UXIE 480 -#define SPECIES_MESPRIT 481 -#define SPECIES_AZELF 482 -#define SPECIES_DIALGA 483 -#define SPECIES_PALKIA 484 -#define SPECIES_HEATRAN 485 -#define SPECIES_REGIGIGAS 486 -#define SPECIES_GIRATINA 487 -#define SPECIES_CRESSELIA 488 -#define SPECIES_PHIONE 489 -#define SPECIES_MANAPHY 490 -#define SPECIES_DARKRAI 491 -#define SPECIES_SHAYMIN 492 -#define SPECIES_ARCEUS 493 -#define SPECIES_VICTINI 494 -#define SPECIES_SNIVY 495 -#define SPECIES_SERVINE 496 -#define SPECIES_SERPERIOR 497 -#define SPECIES_TEPIG 498 -#define SPECIES_PIGNITE 499 -#define SPECIES_EMBOAR 500 -#define SPECIES_OSHAWOTT 501 -#define SPECIES_DEWOTT 502 -#define SPECIES_SAMUROTT 503 -#define SPECIES_PATRAT 504 -#define SPECIES_WATCHOG 505 -#define SPECIES_LILLIPUP 506 -#define SPECIES_HERDIER 507 -#define SPECIES_STOUTLAND 508 -#define SPECIES_PURRLOIN 509 -#define SPECIES_LIEPARD 510 -#define SPECIES_PANSAGE 511 -#define SPECIES_SIMISAGE 512 -#define SPECIES_PANSEAR 513 -#define SPECIES_SIMISEAR 514 -#define SPECIES_PANPOUR 515 -#define SPECIES_SIMIPOUR 516 -#define SPECIES_MUNNA 517 -#define SPECIES_MUSHARNA 518 -#define SPECIES_PIDOVE 519 -#define SPECIES_TRANQUILL 520 -#define SPECIES_UNFEZANT 521 -#define SPECIES_BLITZLE 522 -#define SPECIES_ZEBSTRIKA 523 -#define SPECIES_ROGGENROLA 524 -#define SPECIES_BOLDORE 525 -#define SPECIES_GIGALITH 526 -#define SPECIES_WOOBAT 527 -#define SPECIES_SWOOBAT 528 -#define SPECIES_DRILBUR 529 -#define SPECIES_EXCADRILL 530 -#define SPECIES_AUDINO 531 -#define SPECIES_TIMBURR 532 -#define SPECIES_GURDURR 533 -#define SPECIES_CONKELDURR 534 -#define SPECIES_TYMPOLE 535 -#define SPECIES_PALPITOAD 536 -#define SPECIES_SEISMITOAD 537 -#define SPECIES_THROH 538 -#define SPECIES_SAWK 539 -#define SPECIES_SEWADDLE 540 -#define SPECIES_SWADLOON 541 -#define SPECIES_LEAVANNY 542 -#define SPECIES_VENIPEDE 543 -#define SPECIES_WHIRLIPEDE 544 -#define SPECIES_SCOLIPEDE 545 -#define SPECIES_COTTONEE 546 -#define SPECIES_WHIMSICOTT 547 -#define SPECIES_PETILIL 548 -#define SPECIES_LILLIGANT 549 -#define SPECIES_BASCULIN 550 -#define SPECIES_SANDILE 551 -#define SPECIES_KROKOROK 552 -#define SPECIES_KROOKODILE 553 -#define SPECIES_DARUMAKA 554 -#define SPECIES_DARMANITAN 555 -#define SPECIES_MARACTUS 556 -#define SPECIES_DWEBBLE 557 -#define SPECIES_CRUSTLE 558 -#define SPECIES_SCRAGGY 559 -#define SPECIES_SCRAFTY 560 -#define SPECIES_SIGILYPH 561 -#define SPECIES_YAMASK 562 -#define SPECIES_COFAGRIGUS 563 -#define SPECIES_TIRTOUGA 564 -#define SPECIES_CARRACOSTA 565 -#define SPECIES_ARCHEN 566 -#define SPECIES_ARCHEOPS 567 -#define SPECIES_TRUBBISH 568 -#define SPECIES_GARBODOR 569 -#define SPECIES_ZORUA 570 -#define SPECIES_ZOROARK 571 -#define SPECIES_MINCCINO 572 -#define SPECIES_CINCCINO 573 -#define SPECIES_GOTHITA 574 -#define SPECIES_GOTHORITA 575 -#define SPECIES_GOTHITELLE 576 -#define SPECIES_SOLOSIS 577 -#define SPECIES_DUOSION 578 -#define SPECIES_REUNICLUS 579 -#define SPECIES_DUCKLETT 580 -#define SPECIES_SWANNA 581 -#define SPECIES_VANILLITE 582 -#define SPECIES_VANILLISH 583 -#define SPECIES_VANILLUXE 584 -#define SPECIES_DEERLING 585 -#define SPECIES_SAWSBUCK 586 -#define SPECIES_EMOLGA 587 -#define SPECIES_KARRABLAST 588 -#define SPECIES_ESCAVALIER 589 -#define SPECIES_FOONGUS 590 -#define SPECIES_AMOONGUSS 591 -#define SPECIES_FRILLISH 592 -#define SPECIES_JELLICENT 593 -#define SPECIES_ALOMOMOLA 594 -#define SPECIES_JOLTIK 595 -#define SPECIES_GALVANTULA 596 -#define SPECIES_FERROSEED 597 -#define SPECIES_FERROTHORN 598 -#define SPECIES_KLINK 599 -#define SPECIES_KLANG 600 -#define SPECIES_KLINKLANG 601 -#define SPECIES_TYNAMO 602 -#define SPECIES_EELEKTRIK 603 -#define SPECIES_EELEKTROSS 604 -#define SPECIES_ELGYEM 605 -#define SPECIES_BEHEEYEM 606 -#define SPECIES_LITWICK 607 -#define SPECIES_LAMPENT 608 -#define SPECIES_CHANDELURE 609 -#define SPECIES_AXEW 610 -#define SPECIES_FRAXURE 611 -#define SPECIES_HAXORUS 612 -#define SPECIES_CUBCHOO 613 -#define SPECIES_BEARTIC 614 -#define SPECIES_CRYOGONAL 615 -#define SPECIES_SHELMET 616 -#define SPECIES_ACCELGOR 617 -#define SPECIES_STUNFISK 618 -#define SPECIES_MIENFOO 619 -#define SPECIES_MIENSHAO 620 -#define SPECIES_DRUDDIGON 621 -#define SPECIES_GOLETT 622 -#define SPECIES_GOLURK 623 -#define SPECIES_PAWNIARD 624 -#define SPECIES_BISHARP 625 -#define SPECIES_BOUFFALANT 626 -#define SPECIES_RUFFLET 627 -#define SPECIES_BRAVIARY 628 -#define SPECIES_VULLABY 629 -#define SPECIES_MANDIBUZZ 630 -#define SPECIES_HEATMOR 631 -#define SPECIES_DURANT 632 -#define SPECIES_DEINO 633 -#define SPECIES_ZWEILOUS 634 -#define SPECIES_HYDREIGON 635 -#define SPECIES_LARVESTA 636 -#define SPECIES_VOLCARONA 637 -#define SPECIES_COBALION 638 -#define SPECIES_TERRAKION 639 -#define SPECIES_VIRIZION 640 -#define SPECIES_TORNADUS 641 -#define SPECIES_THUNDURUS 642 -#define SPECIES_RESHIRAM 643 -#define SPECIES_ZEKROM 644 -#define SPECIES_LANDORUS 645 -#define SPECIES_KYUREM 646 -#define SPECIES_KELDEO 647 -#define SPECIES_MELOETTA 648 -#define SPECIES_GENESECT 649 -#define SPECIES_CHESPIN 650 -#define SPECIES_QUILLADIN 651 -#define SPECIES_CHESNAUGHT 652 -#define SPECIES_FENNEKIN 653 -#define SPECIES_BRAIXEN 654 -#define SPECIES_DELPHOX 655 -#define SPECIES_FROAKIE 656 -#define SPECIES_FROGADIER 657 -#define SPECIES_GRENINJA 658 -#define SPECIES_BUNNELBY 659 -#define SPECIES_DIGGERSBY 660 -#define SPECIES_FLETCHLING 661 -#define SPECIES_FLETCHINDER 662 -#define SPECIES_TALONFLAME 663 -#define SPECIES_SCATTERBUG 664 -#define SPECIES_SPEWPA 665 -#define SPECIES_VIVILLON 666 // Icy Snow Pattern -#define SPECIES_LITLEO 667 -#define SPECIES_PYROAR 668 -#define SPECIES_FLABEBE 669 // Red Flower -#define SPECIES_FLOETTE 670 -#define SPECIES_FLORGES 671 -#define SPECIES_SKIDDO 672 -#define SPECIES_GOGOAT 673 -#define SPECIES_PANCHAM 674 -#define SPECIES_PANGORO 675 -#define SPECIES_FURFROU 676 -#define SPECIES_ESPURR 677 -#define SPECIES_MEOWSTIC 678 -#define SPECIES_HONEDGE 679 -#define SPECIES_DOUBLADE 680 -#define SPECIES_AEGISLASH 681 -#define SPECIES_SPRITZEE 682 -#define SPECIES_AROMATISSE 683 -#define SPECIES_SWIRLIX 684 -#define SPECIES_SLURPUFF 685 -#define SPECIES_INKAY 686 -#define SPECIES_MALAMAR 687 -#define SPECIES_BINACLE 688 -#define SPECIES_BARBARACLE 689 -#define SPECIES_SKRELP 690 -#define SPECIES_DRAGALGE 691 -#define SPECIES_CLAUNCHER 692 -#define SPECIES_CLAWITZER 693 -#define SPECIES_HELIOPTILE 694 -#define SPECIES_HELIOLISK 695 -#define SPECIES_TYRUNT 696 -#define SPECIES_TYRANTRUM 697 -#define SPECIES_AMAURA 698 -#define SPECIES_AURORUS 699 -#define SPECIES_SYLVEON 700 -#define SPECIES_HAWLUCHA 701 -#define SPECIES_DEDENNE 702 -#define SPECIES_CARBINK 703 -#define SPECIES_GOOMY 704 -#define SPECIES_SLIGGOO 705 -#define SPECIES_GOODRA 706 -#define SPECIES_KLEFKI 707 -#define SPECIES_PHANTUMP 708 -#define SPECIES_TREVENANT 709 -#define SPECIES_PUMPKABOO 710 -#define SPECIES_GOURGEIST 711 -#define SPECIES_BERGMITE 712 -#define SPECIES_AVALUGG 713 -#define SPECIES_NOIBAT 714 -#define SPECIES_NOIVERN 715 -#define SPECIES_XERNEAS 716 -#define SPECIES_YVELTAL 717 -#define SPECIES_ZYGARDE 718 -#define SPECIES_DIANCIE 719 -#define SPECIES_HOOPA 720 -#define SPECIES_VOLCANION 721 -#define SPECIES_ROWLET 722 -#define SPECIES_DARTRIX 723 -#define SPECIES_DECIDUEYE 724 -#define SPECIES_LITTEN 725 -#define SPECIES_TORRACAT 726 -#define SPECIES_INCINEROAR 727 -#define SPECIES_POPPLIO 728 -#define SPECIES_BRIONNE 729 -#define SPECIES_PRIMARINA 730 -#define SPECIES_PIKIPEK 731 -#define SPECIES_TRUMBEAK 732 -#define SPECIES_TOUCANNON 733 -#define SPECIES_YUNGOOS 734 -#define SPECIES_GUMSHOOS 735 -#define SPECIES_GRUBBIN 736 -#define SPECIES_CHARJABUG 737 -#define SPECIES_VIKAVOLT 738 -#define SPECIES_CRABRAWLER 739 -#define SPECIES_CRABOMINABLE 740 -#define SPECIES_ORICORIO 741 -#define SPECIES_CUTIEFLY 742 -#define SPECIES_RIBOMBEE 743 -#define SPECIES_ROCKRUFF 744 -#define SPECIES_LYCANROC 745 -#define SPECIES_WISHIWASHI 746 -#define SPECIES_MAREANIE 747 -#define SPECIES_TOXAPEX 748 -#define SPECIES_MUDBRAY 749 -#define SPECIES_MUDSDALE 750 -#define SPECIES_DEWPIDER 751 -#define SPECIES_ARAQUANID 752 -#define SPECIES_FOMANTIS 753 -#define SPECIES_LURANTIS 754 -#define SPECIES_MORELULL 755 -#define SPECIES_SHIINOTIC 756 -#define SPECIES_SALANDIT 757 -#define SPECIES_SALAZZLE 758 -#define SPECIES_STUFFUL 759 -#define SPECIES_BEWEAR 760 -#define SPECIES_BOUNSWEET 761 -#define SPECIES_STEENEE 762 -#define SPECIES_TSAREENA 763 -#define SPECIES_COMFEY 764 -#define SPECIES_ORANGURU 765 -#define SPECIES_PASSIMIAN 766 -#define SPECIES_WIMPOD 767 -#define SPECIES_GOLISOPOD 768 -#define SPECIES_SANDYGAST 769 -#define SPECIES_PALOSSAND 770 -#define SPECIES_PYUKUMUKU 771 -#define SPECIES_TYPE_NULL 772 -#define SPECIES_SILVALLY 773 -#define SPECIES_MINIOR 774 -#define SPECIES_KOMALA 775 -#define SPECIES_TURTONATOR 776 -#define SPECIES_TOGEDEMARU 777 -#define SPECIES_MIMIKYU 778 -#define SPECIES_BRUXISH 779 -#define SPECIES_DRAMPA 780 -#define SPECIES_DHELMISE 781 -#define SPECIES_JANGMO_O 782 -#define SPECIES_HAKAMO_O 783 -#define SPECIES_KOMMO_O 784 -#define SPECIES_TAPU_KOKO 785 -#define SPECIES_TAPU_LELE 786 -#define SPECIES_TAPU_BULU 787 -#define SPECIES_TAPU_FINI 788 -#define SPECIES_COSMOG 789 -#define SPECIES_COSMOEM 790 -#define SPECIES_SOLGALEO 791 -#define SPECIES_LUNALA 792 -#define SPECIES_NIHILEGO 793 -#define SPECIES_BUZZWOLE 794 -#define SPECIES_PHEROMOSA 795 -#define SPECIES_XURKITREE 796 -#define SPECIES_CELESTEELA 797 -#define SPECIES_KARTANA 798 -#define SPECIES_GUZZLORD 799 -#define SPECIES_NECROZMA 800 -#define SPECIES_MAGEARNA 801 -#define SPECIES_MARSHADOW 802 -#define SPECIES_POIPOLE 803 -#define SPECIES_NAGANADEL 804 -#define SPECIES_STAKATAKA 805 -#define SPECIES_BLACEPHALON 806 -#define SPECIES_ZERAORA 807 -#define SPECIES_MELTAN 808 -#define SPECIES_MELMETAL 809 -#define SPECIES_GROOKEY 810 -#define SPECIES_THWACKEY 811 -#define SPECIES_RILLABOOM 812 -#define SPECIES_SCORBUNNY 813 -#define SPECIES_RABOOT 814 -#define SPECIES_CINDERACE 815 -#define SPECIES_SOBBLE 816 -#define SPECIES_DRIZZILE 817 -#define SPECIES_INTELEON 818 -#define SPECIES_SKWOVET 819 -#define SPECIES_GREEDENT 820 -#define SPECIES_ROOKIDEE 821 -#define SPECIES_CORVISQUIRE 822 -#define SPECIES_CORVIKNIGHT 823 -#define SPECIES_BLIPBUG 824 -#define SPECIES_DOTTLER 825 -#define SPECIES_ORBEETLE 826 -#define SPECIES_NICKIT 827 -#define SPECIES_THIEVUL 828 -#define SPECIES_GOSSIFLEUR 829 -#define SPECIES_ELDEGOSS 830 -#define SPECIES_WOOLOO 831 -#define SPECIES_DUBWOOL 832 -#define SPECIES_CHEWTLE 833 -#define SPECIES_DREDNAW 834 -#define SPECIES_YAMPER 835 -#define SPECIES_BOLTUND 836 -#define SPECIES_ROLYCOLY 837 -#define SPECIES_CARKOL 838 -#define SPECIES_COALOSSAL 839 -#define SPECIES_APPLIN 840 -#define SPECIES_FLAPPLE 841 -#define SPECIES_APPLETUN 842 -#define SPECIES_SILICOBRA 843 -#define SPECIES_SANDACONDA 844 -#define SPECIES_CRAMORANT 845 -#define SPECIES_ARROKUDA 846 -#define SPECIES_BARRASKEWDA 847 -#define SPECIES_TOXEL 848 -#define SPECIES_TOXTRICITY 849 -#define SPECIES_SIZZLIPEDE 850 -#define SPECIES_CENTISKORCH 851 -#define SPECIES_CLOBBOPUS 852 -#define SPECIES_GRAPPLOCT 853 -#define SPECIES_SINISTEA 854 -#define SPECIES_POLTEAGEIST 855 -#define SPECIES_HATENNA 856 -#define SPECIES_HATTREM 857 -#define SPECIES_HATTERENE 858 -#define SPECIES_IMPIDIMP 859 -#define SPECIES_MORGREM 860 -#define SPECIES_GRIMMSNARL 861 -#define SPECIES_OBSTAGOON 862 -#define SPECIES_PERRSERKER 863 -#define SPECIES_CURSOLA 864 -#define SPECIES_SIRFETCHD 865 -#define SPECIES_MR_RIME 866 -#define SPECIES_RUNERIGUS 867 -#define SPECIES_MILCERY 868 -#define SPECIES_ALCREMIE 869 -#define SPECIES_FALINKS 870 -#define SPECIES_PINCURCHIN 871 -#define SPECIES_SNOM 872 -#define SPECIES_FROSMOTH 873 -#define SPECIES_STONJOURNER 874 -#define SPECIES_EISCUE 875 -#define SPECIES_INDEEDEE 876 -#define SPECIES_MORPEKO 877 -#define SPECIES_CUFANT 878 -#define SPECIES_COPPERAJAH 879 -#define SPECIES_DRACOZOLT 880 -#define SPECIES_ARCTOZOLT 881 -#define SPECIES_DRACOVISH 882 -#define SPECIES_ARCTOVISH 883 -#define SPECIES_DURALUDON 884 -#define SPECIES_DREEPY 885 -#define SPECIES_DRAKLOAK 886 -#define SPECIES_DRAGAPULT 887 -#define SPECIES_ZACIAN 888 -#define SPECIES_ZAMAZENTA 889 -#define SPECIES_ETERNATUS 890 -#define SPECIES_KUBFU 891 -#define SPECIES_URSHIFU 892 -#define SPECIES_ZARUDE 893 -#define SPECIES_REGIELEKI 894 -#define SPECIES_REGIDRAGO 895 -#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 SPECIES_NONE 0 +#define SPECIES_BULBASAUR 1 +#define SPECIES_IVYSAUR 2 +#define SPECIES_VENUSAUR 3 +#define SPECIES_CHARMANDER 4 +#define SPECIES_CHARMELEON 5 +#define SPECIES_CHARIZARD 6 +#define SPECIES_SQUIRTLE 7 +#define SPECIES_WARTORTLE 8 +#define SPECIES_BLASTOISE 9 +#define SPECIES_CATERPIE 10 +#define SPECIES_METAPOD 11 +#define SPECIES_BUTTERFREE 12 +#define SPECIES_WEEDLE 13 +#define SPECIES_KAKUNA 14 +#define SPECIES_BEEDRILL 15 +#define SPECIES_PIDGEY 16 +#define SPECIES_PIDGEOTTO 17 +#define SPECIES_PIDGEOT 18 +#define SPECIES_RATTATA 19 +#define SPECIES_RATICATE 20 +#define SPECIES_SPEAROW 21 +#define SPECIES_FEAROW 22 +#define SPECIES_EKANS 23 +#define SPECIES_ARBOK 24 +#define SPECIES_PIKACHU 25 +#define SPECIES_RAICHU 26 +#define SPECIES_SANDSHREW 27 +#define SPECIES_SANDSLASH 28 +#define SPECIES_NIDORAN_F 29 +#define SPECIES_NIDORINA 30 +#define SPECIES_NIDOQUEEN 31 +#define SPECIES_NIDORAN_M 32 +#define SPECIES_NIDORINO 33 +#define SPECIES_NIDOKING 34 +#define SPECIES_CLEFAIRY 35 +#define SPECIES_CLEFABLE 36 +#define SPECIES_VULPIX 37 +#define SPECIES_NINETALES 38 +#define SPECIES_JIGGLYPUFF 39 +#define SPECIES_WIGGLYTUFF 40 +#define SPECIES_ZUBAT 41 +#define SPECIES_GOLBAT 42 +#define SPECIES_ODDISH 43 +#define SPECIES_GLOOM 44 +#define SPECIES_VILEPLUME 45 +#define SPECIES_PARAS 46 +#define SPECIES_PARASECT 47 +#define SPECIES_VENONAT 48 +#define SPECIES_VENOMOTH 49 +#define SPECIES_DIGLETT 50 +#define SPECIES_DUGTRIO 51 +#define SPECIES_MEOWTH 52 +#define SPECIES_PERSIAN 53 +#define SPECIES_PSYDUCK 54 +#define SPECIES_GOLDUCK 55 +#define SPECIES_MANKEY 56 +#define SPECIES_PRIMEAPE 57 +#define SPECIES_GROWLITHE 58 +#define SPECIES_ARCANINE 59 +#define SPECIES_POLIWAG 60 +#define SPECIES_POLIWHIRL 61 +#define SPECIES_POLIWRATH 62 +#define SPECIES_ABRA 63 +#define SPECIES_KADABRA 64 +#define SPECIES_ALAKAZAM 65 +#define SPECIES_MACHOP 66 +#define SPECIES_MACHOKE 67 +#define SPECIES_MACHAMP 68 +#define SPECIES_BELLSPROUT 69 +#define SPECIES_WEEPINBELL 70 +#define SPECIES_VICTREEBEL 71 +#define SPECIES_TENTACOOL 72 +#define SPECIES_TENTACRUEL 73 +#define SPECIES_GEODUDE 74 +#define SPECIES_GRAVELER 75 +#define SPECIES_GOLEM 76 +#define SPECIES_PONYTA 77 +#define SPECIES_RAPIDASH 78 +#define SPECIES_SLOWPOKE 79 +#define SPECIES_SLOWBRO 80 +#define SPECIES_MAGNEMITE 81 +#define SPECIES_MAGNETON 82 +#define SPECIES_FARFETCHD 83 +#define SPECIES_DODUO 84 +#define SPECIES_DODRIO 85 +#define SPECIES_SEEL 86 +#define SPECIES_DEWGONG 87 +#define SPECIES_GRIMER 88 +#define SPECIES_MUK 89 +#define SPECIES_SHELLDER 90 +#define SPECIES_CLOYSTER 91 +#define SPECIES_GASTLY 92 +#define SPECIES_HAUNTER 93 +#define SPECIES_GENGAR 94 +#define SPECIES_ONIX 95 +#define SPECIES_DROWZEE 96 +#define SPECIES_HYPNO 97 +#define SPECIES_KRABBY 98 +#define SPECIES_KINGLER 99 +#define SPECIES_VOLTORB 100 +#define SPECIES_ELECTRODE 101 +#define SPECIES_EXEGGCUTE 102 +#define SPECIES_EXEGGUTOR 103 +#define SPECIES_CUBONE 104 +#define SPECIES_MAROWAK 105 +#define SPECIES_HITMONLEE 106 +#define SPECIES_HITMONCHAN 107 +#define SPECIES_LICKITUNG 108 +#define SPECIES_KOFFING 109 +#define SPECIES_WEEZING 110 +#define SPECIES_RHYHORN 111 +#define SPECIES_RHYDON 112 +#define SPECIES_CHANSEY 113 +#define SPECIES_TANGELA 114 +#define SPECIES_KANGASKHAN 115 +#define SPECIES_HORSEA 116 +#define SPECIES_SEADRA 117 +#define SPECIES_GOLDEEN 118 +#define SPECIES_SEAKING 119 +#define SPECIES_STARYU 120 +#define SPECIES_STARMIE 121 +#define SPECIES_MR_MIME 122 +#define SPECIES_SCYTHER 123 +#define SPECIES_JYNX 124 +#define SPECIES_ELECTABUZZ 125 +#define SPECIES_MAGMAR 126 +#define SPECIES_PINSIR 127 +#define SPECIES_TAUROS 128 +#define SPECIES_MAGIKARP 129 +#define SPECIES_GYARADOS 130 +#define SPECIES_LAPRAS 131 +#define SPECIES_DITTO 132 +#define SPECIES_EEVEE 133 +#define SPECIES_VAPOREON 134 +#define SPECIES_JOLTEON 135 +#define SPECIES_FLAREON 136 +#define SPECIES_PORYGON 137 +#define SPECIES_OMANYTE 138 +#define SPECIES_OMASTAR 139 +#define SPECIES_KABUTO 140 +#define SPECIES_KABUTOPS 141 +#define SPECIES_AERODACTYL 142 +#define SPECIES_SNORLAX 143 +#define SPECIES_ARTICUNO 144 +#define SPECIES_ZAPDOS 145 +#define SPECIES_MOLTRES 146 +#define SPECIES_DRATINI 147 +#define SPECIES_DRAGONAIR 148 +#define SPECIES_DRAGONITE 149 +#define SPECIES_MEWTWO 150 +#define SPECIES_MEW 151 +#define SPECIES_CHIKORITA 152 +#define SPECIES_BAYLEEF 153 +#define SPECIES_MEGANIUM 154 +#define SPECIES_CYNDAQUIL 155 +#define SPECIES_QUILAVA 156 +#define SPECIES_TYPHLOSION 157 +#define SPECIES_TOTODILE 158 +#define SPECIES_CROCONAW 159 +#define SPECIES_FERALIGATR 160 +#define SPECIES_SENTRET 161 +#define SPECIES_FURRET 162 +#define SPECIES_HOOTHOOT 163 +#define SPECIES_NOCTOWL 164 +#define SPECIES_LEDYBA 165 +#define SPECIES_LEDIAN 166 +#define SPECIES_SPINARAK 167 +#define SPECIES_ARIADOS 168 +#define SPECIES_CROBAT 169 +#define SPECIES_CHINCHOU 170 +#define SPECIES_LANTURN 171 +#define SPECIES_PICHU 172 +#define SPECIES_CLEFFA 173 +#define SPECIES_IGGLYBUFF 174 +#define SPECIES_TOGEPI 175 +#define SPECIES_TOGETIC 176 +#define SPECIES_NATU 177 +#define SPECIES_XATU 178 +#define SPECIES_MAREEP 179 +#define SPECIES_FLAAFFY 180 +#define SPECIES_AMPHAROS 181 +#define SPECIES_BELLOSSOM 182 +#define SPECIES_MARILL 183 +#define SPECIES_AZUMARILL 184 +#define SPECIES_SUDOWOODO 185 +#define SPECIES_POLITOED 186 +#define SPECIES_HOPPIP 187 +#define SPECIES_SKIPLOOM 188 +#define SPECIES_JUMPLUFF 189 +#define SPECIES_AIPOM 190 +#define SPECIES_SUNKERN 191 +#define SPECIES_SUNFLORA 192 +#define SPECIES_YANMA 193 +#define SPECIES_WOOPER 194 +#define SPECIES_QUAGSIRE 195 +#define SPECIES_ESPEON 196 +#define SPECIES_UMBREON 197 +#define SPECIES_MURKROW 198 +#define SPECIES_SLOWKING 199 +#define SPECIES_MISDREAVUS 200 +#define SPECIES_UNOWN 201 +#define SPECIES_WOBBUFFET 202 +#define SPECIES_GIRAFARIG 203 +#define SPECIES_PINECO 204 +#define SPECIES_FORRETRESS 205 +#define SPECIES_DUNSPARCE 206 +#define SPECIES_GLIGAR 207 +#define SPECIES_STEELIX 208 +#define SPECIES_SNUBBULL 209 +#define SPECIES_GRANBULL 210 +#define SPECIES_QWILFISH 211 +#define SPECIES_SCIZOR 212 +#define SPECIES_SHUCKLE 213 +#define SPECIES_HERACROSS 214 +#define SPECIES_SNEASEL 215 +#define SPECIES_TEDDIURSA 216 +#define SPECIES_URSARING 217 +#define SPECIES_SLUGMA 218 +#define SPECIES_MAGCARGO 219 +#define SPECIES_SWINUB 220 +#define SPECIES_PILOSWINE 221 +#define SPECIES_CORSOLA 222 +#define SPECIES_REMORAID 223 +#define SPECIES_OCTILLERY 224 +#define SPECIES_DELIBIRD 225 +#define SPECIES_MANTINE 226 +#define SPECIES_SKARMORY 227 +#define SPECIES_HOUNDOUR 228 +#define SPECIES_HOUNDOOM 229 +#define SPECIES_KINGDRA 230 +#define SPECIES_PHANPY 231 +#define SPECIES_DONPHAN 232 +#define SPECIES_PORYGON2 233 +#define SPECIES_STANTLER 234 +#define SPECIES_SMEARGLE 235 +#define SPECIES_TYROGUE 236 +#define SPECIES_HITMONTOP 237 +#define SPECIES_SMOOCHUM 238 +#define SPECIES_ELEKID 239 +#define SPECIES_MAGBY 240 +#define SPECIES_MILTANK 241 +#define SPECIES_BLISSEY 242 +#define SPECIES_RAIKOU 243 +#define SPECIES_ENTEI 244 +#define SPECIES_SUICUNE 245 +#define SPECIES_LARVITAR 246 +#define SPECIES_PUPITAR 247 +#define SPECIES_TYRANITAR 248 +#define SPECIES_LUGIA 249 +#define SPECIES_HO_OH 250 +#define SPECIES_CELEBI 251 +#define SPECIES_TREECKO 252 +#define SPECIES_GROVYLE 253 +#define SPECIES_SCEPTILE 254 +#define SPECIES_TORCHIC 255 +#define SPECIES_COMBUSKEN 256 +#define SPECIES_BLAZIKEN 257 +#define SPECIES_MUDKIP 258 +#define SPECIES_MARSHTOMP 259 +#define SPECIES_SWAMPERT 260 +#define SPECIES_POOCHYENA 261 +#define SPECIES_MIGHTYENA 262 +#define SPECIES_ZIGZAGOON 263 +#define SPECIES_LINOONE 264 +#define SPECIES_WURMPLE 265 +#define SPECIES_SILCOON 266 +#define SPECIES_BEAUTIFLY 267 +#define SPECIES_CASCOON 268 +#define SPECIES_DUSTOX 269 +#define SPECIES_LOTAD 270 +#define SPECIES_LOMBRE 271 +#define SPECIES_LUDICOLO 272 +#define SPECIES_SEEDOT 273 +#define SPECIES_NUZLEAF 274 +#define SPECIES_SHIFTRY 275 +#define SPECIES_TAILLOW 276 +#define SPECIES_SWELLOW 277 +#define SPECIES_WINGULL 278 +#define SPECIES_PELIPPER 279 +#define SPECIES_RALTS 280 +#define SPECIES_KIRLIA 281 +#define SPECIES_GARDEVOIR 282 +#define SPECIES_SURSKIT 283 +#define SPECIES_MASQUERAIN 284 +#define SPECIES_SHROOMISH 285 +#define SPECIES_BRELOOM 286 +#define SPECIES_SLAKOTH 287 +#define SPECIES_VIGOROTH 288 +#define SPECIES_SLAKING 289 +#define SPECIES_NINCADA 290 +#define SPECIES_NINJASK 291 +#define SPECIES_SHEDINJA 292 +#define SPECIES_WHISMUR 293 +#define SPECIES_LOUDRED 294 +#define SPECIES_EXPLOUD 295 +#define SPECIES_MAKUHITA 296 +#define SPECIES_HARIYAMA 297 +#define SPECIES_AZURILL 298 +#define SPECIES_NOSEPASS 299 +#define SPECIES_SKITTY 300 +#define SPECIES_DELCATTY 301 +#define SPECIES_SABLEYE 302 +#define SPECIES_MAWILE 303 +#define SPECIES_ARON 304 +#define SPECIES_LAIRON 305 +#define SPECIES_AGGRON 306 +#define SPECIES_MEDITITE 307 +#define SPECIES_MEDICHAM 308 +#define SPECIES_ELECTRIKE 309 +#define SPECIES_MANECTRIC 310 +#define SPECIES_PLUSLE 311 +#define SPECIES_MINUN 312 +#define SPECIES_VOLBEAT 313 +#define SPECIES_ILLUMISE 314 +#define SPECIES_ROSELIA 315 +#define SPECIES_GULPIN 316 +#define SPECIES_SWALOT 317 +#define SPECIES_CARVANHA 318 +#define SPECIES_SHARPEDO 319 +#define SPECIES_WAILMER 320 +#define SPECIES_WAILORD 321 +#define SPECIES_NUMEL 322 +#define SPECIES_CAMERUPT 323 +#define SPECIES_TORKOAL 324 +#define SPECIES_SPOINK 325 +#define SPECIES_GRUMPIG 326 +#define SPECIES_SPINDA 327 +#define SPECIES_TRAPINCH 328 +#define SPECIES_VIBRAVA 329 +#define SPECIES_FLYGON 330 +#define SPECIES_CACNEA 331 +#define SPECIES_CACTURNE 332 +#define SPECIES_SWABLU 333 +#define SPECIES_ALTARIA 334 +#define SPECIES_ZANGOOSE 335 +#define SPECIES_SEVIPER 336 +#define SPECIES_LUNATONE 337 +#define SPECIES_SOLROCK 338 +#define SPECIES_BARBOACH 339 +#define SPECIES_WHISCASH 340 +#define SPECIES_CORPHISH 341 +#define SPECIES_CRAWDAUNT 342 +#define SPECIES_BALTOY 343 +#define SPECIES_CLAYDOL 344 +#define SPECIES_LILEEP 345 +#define SPECIES_CRADILY 346 +#define SPECIES_ANORITH 347 +#define SPECIES_ARMALDO 348 +#define SPECIES_FEEBAS 349 +#define SPECIES_MILOTIC 350 +#define SPECIES_CASTFORM SPECIES_CASTFORM_NORMAL +#define SPECIES_CASTFORM_NORMAL 351 +#define SPECIES_KECLEON 352 +#define SPECIES_SHUPPET 353 +#define SPECIES_BANETTE 354 +#define SPECIES_DUSKULL 355 +#define SPECIES_DUSCLOPS 356 +#define SPECIES_TROPIUS 357 +#define SPECIES_CHIMECHO 358 +#define SPECIES_ABSOL 359 +#define SPECIES_WYNAUT 360 +#define SPECIES_SNORUNT 361 +#define SPECIES_GLALIE 362 +#define SPECIES_SPHEAL 363 +#define SPECIES_SEALEO 364 +#define SPECIES_WALREIN 365 +#define SPECIES_CLAMPERL 366 +#define SPECIES_HUNTAIL 367 +#define SPECIES_GOREBYSS 368 +#define SPECIES_RELICANTH 369 +#define SPECIES_LUVDISC 370 +#define SPECIES_BAGON 371 +#define SPECIES_SHELGON 372 +#define SPECIES_SALAMENCE 373 +#define SPECIES_BELDUM 374 +#define SPECIES_METANG 375 +#define SPECIES_METAGROSS 376 +#define SPECIES_REGIROCK 377 +#define SPECIES_REGICE 378 +#define SPECIES_REGISTEEL 379 +#define SPECIES_LATIAS 380 +#define SPECIES_LATIOS 381 +#define SPECIES_KYOGRE 382 +#define SPECIES_GROUDON 383 +#define SPECIES_RAYQUAZA 384 +#define SPECIES_JIRACHI 385 +#define SPECIES_DEOXYS SPECIES_DEOXYS_NORMAL +#define SPECIES_DEOXYS_NORMAL 386 +#define SPECIES_TURTWIG 387 +#define SPECIES_GROTLE 388 +#define SPECIES_TORTERRA 389 +#define SPECIES_CHIMCHAR 390 +#define SPECIES_MONFERNO 391 +#define SPECIES_INFERNAPE 392 +#define SPECIES_PIPLUP 393 +#define SPECIES_PRINPLUP 394 +#define SPECIES_EMPOLEON 395 +#define SPECIES_STARLY 396 +#define SPECIES_STARAVIA 397 +#define SPECIES_STARAPTOR 398 +#define SPECIES_BIDOOF 399 +#define SPECIES_BIBAREL 400 +#define SPECIES_KRICKETOT 401 +#define SPECIES_KRICKETUNE 402 +#define SPECIES_SHINX 403 +#define SPECIES_LUXIO 404 +#define SPECIES_LUXRAY 405 +#define SPECIES_BUDEW 406 +#define SPECIES_ROSERADE 407 +#define SPECIES_CRANIDOS 408 +#define SPECIES_RAMPARDOS 409 +#define SPECIES_SHIELDON 410 +#define SPECIES_BASTIODON 411 +#define SPECIES_BURMY SPECIES_BURMY_PLANT_CLOAK +#define SPECIES_BURMY_PLANT_CLOAK 412 +#define SPECIES_WORMADAM SPECIES_WORMADAM_PLANT_CLOAK +#define SPECIES_WORMADAM_PLANT_CLOAK 413 +#define SPECIES_MOTHIM 414 +#define SPECIES_COMBEE 415 +#define SPECIES_VESPIQUEN 416 +#define SPECIES_PACHIRISU 417 +#define SPECIES_BUIZEL 418 +#define SPECIES_FLOATZEL 419 +#define SPECIES_CHERUBI 420 +#define SPECIES_CHERRIM SPECIES_CHERRIM_OVERCAST +#define SPECIES_CHERRIM_OVERCAST 421 +#define SPECIES_SHELLOS SPECIES_SHELLOS_WEST_SEA +#define SPECIES_SHELLOS_WEST_SEA 422 +#define SPECIES_GASTRODON SPECIES_GASTRODON_WEST_SEA +#define SPECIES_GASTRODON_WEST_SEA 423 +#define SPECIES_AMBIPOM 424 +#define SPECIES_DRIFLOON 425 +#define SPECIES_DRIFBLIM 426 +#define SPECIES_BUNEARY 427 +#define SPECIES_LOPUNNY 428 +#define SPECIES_MISMAGIUS 429 +#define SPECIES_HONCHKROW 430 +#define SPECIES_GLAMEOW 431 +#define SPECIES_PURUGLY 432 +#define SPECIES_CHINGLING 433 +#define SPECIES_STUNKY 434 +#define SPECIES_SKUNTANK 435 +#define SPECIES_BRONZOR 436 +#define SPECIES_BRONZONG 437 +#define SPECIES_BONSLY 438 +#define SPECIES_MIME_JR 439 +#define SPECIES_HAPPINY 440 +#define SPECIES_CHATOT 441 +#define SPECIES_SPIRITOMB 442 +#define SPECIES_GIBLE 443 +#define SPECIES_GABITE 444 +#define SPECIES_GARCHOMP 445 +#define SPECIES_MUNCHLAX 446 +#define SPECIES_RIOLU 447 +#define SPECIES_LUCARIO 448 +#define SPECIES_HIPPOPOTAS 449 +#define SPECIES_HIPPOWDON 450 +#define SPECIES_SKORUPI 451 +#define SPECIES_DRAPION 452 +#define SPECIES_CROAGUNK 453 +#define SPECIES_TOXICROAK 454 +#define SPECIES_CARNIVINE 455 +#define SPECIES_FINNEON 456 +#define SPECIES_LUMINEON 457 +#define SPECIES_MANTYKE 458 +#define SPECIES_SNOVER 459 +#define SPECIES_ABOMASNOW 460 +#define SPECIES_WEAVILE 461 +#define SPECIES_MAGNEZONE 462 +#define SPECIES_LICKILICKY 463 +#define SPECIES_RHYPERIOR 464 +#define SPECIES_TANGROWTH 465 +#define SPECIES_ELECTIVIRE 466 +#define SPECIES_MAGMORTAR 467 +#define SPECIES_TOGEKISS 468 +#define SPECIES_YANMEGA 469 +#define SPECIES_LEAFEON 470 +#define SPECIES_GLACEON 471 +#define SPECIES_GLISCOR 472 +#define SPECIES_MAMOSWINE 473 +#define SPECIES_PORYGON_Z 474 +#define SPECIES_GALLADE 475 +#define SPECIES_PROBOPASS 476 +#define SPECIES_DUSKNOIR 477 +#define SPECIES_FROSLASS 478 +#define SPECIES_ROTOM 479 +#define SPECIES_UXIE 480 +#define SPECIES_MESPRIT 481 +#define SPECIES_AZELF 482 +#define SPECIES_DIALGA 483 +#define SPECIES_PALKIA 484 +#define SPECIES_HEATRAN 485 +#define SPECIES_REGIGIGAS 486 +#define SPECIES_GIRATINA SPECIES_GIRATINA_ALTERED +#define SPECIES_GIRATINA_ALTERED 487 +#define SPECIES_CRESSELIA 488 +#define SPECIES_PHIONE 489 +#define SPECIES_MANAPHY 490 +#define SPECIES_DARKRAI 491 +#define SPECIES_SHAYMIN SPECIES_SHAYMIN_LAND +#define SPECIES_SHAYMIN_LAND 492 +#define SPECIES_ARCEUS SPECIES_ARCEUS_NORMAL +#define SPECIES_ARCEUS_NORMAL 493 +#define SPECIES_VICTINI 494 +#define SPECIES_SNIVY 495 +#define SPECIES_SERVINE 496 +#define SPECIES_SERPERIOR 497 +#define SPECIES_TEPIG 498 +#define SPECIES_PIGNITE 499 +#define SPECIES_EMBOAR 500 +#define SPECIES_OSHAWOTT 501 +#define SPECIES_DEWOTT 502 +#define SPECIES_SAMUROTT 503 +#define SPECIES_PATRAT 504 +#define SPECIES_WATCHOG 505 +#define SPECIES_LILLIPUP 506 +#define SPECIES_HERDIER 507 +#define SPECIES_STOUTLAND 508 +#define SPECIES_PURRLOIN 509 +#define SPECIES_LIEPARD 510 +#define SPECIES_PANSAGE 511 +#define SPECIES_SIMISAGE 512 +#define SPECIES_PANSEAR 513 +#define SPECIES_SIMISEAR 514 +#define SPECIES_PANPOUR 515 +#define SPECIES_SIMIPOUR 516 +#define SPECIES_MUNNA 517 +#define SPECIES_MUSHARNA 518 +#define SPECIES_PIDOVE 519 +#define SPECIES_TRANQUILL 520 +#define SPECIES_UNFEZANT 521 +#define SPECIES_BLITZLE 522 +#define SPECIES_ZEBSTRIKA 523 +#define SPECIES_ROGGENROLA 524 +#define SPECIES_BOLDORE 525 +#define SPECIES_GIGALITH 526 +#define SPECIES_WOOBAT 527 +#define SPECIES_SWOOBAT 528 +#define SPECIES_DRILBUR 529 +#define SPECIES_EXCADRILL 530 +#define SPECIES_AUDINO 531 +#define SPECIES_TIMBURR 532 +#define SPECIES_GURDURR 533 +#define SPECIES_CONKELDURR 534 +#define SPECIES_TYMPOLE 535 +#define SPECIES_PALPITOAD 536 +#define SPECIES_SEISMITOAD 537 +#define SPECIES_THROH 538 +#define SPECIES_SAWK 539 +#define SPECIES_SEWADDLE 540 +#define SPECIES_SWADLOON 541 +#define SPECIES_LEAVANNY 542 +#define SPECIES_VENIPEDE 543 +#define SPECIES_WHIRLIPEDE 544 +#define SPECIES_SCOLIPEDE 545 +#define SPECIES_COTTONEE 546 +#define SPECIES_WHIMSICOTT 547 +#define SPECIES_PETILIL 548 +#define SPECIES_LILLIGANT 549 +#define SPECIES_BASCULIN SPECIES_BASCULIN_RED_STRIPED +#define SPECIES_BASCULIN_RED_STRIPED 550 +#define SPECIES_SANDILE 551 +#define SPECIES_KROKOROK 552 +#define SPECIES_KROOKODILE 553 +#define SPECIES_DARUMAKA 554 +#define SPECIES_DARMANITAN SPECIES_DARMANITAN_STANDARD_MODE +#define SPECIES_DARMANITAN_STANDARD_MODE 555 +#define SPECIES_MARACTUS 556 +#define SPECIES_DWEBBLE 557 +#define SPECIES_CRUSTLE 558 +#define SPECIES_SCRAGGY 559 +#define SPECIES_SCRAFTY 560 +#define SPECIES_SIGILYPH 561 +#define SPECIES_YAMASK 562 +#define SPECIES_COFAGRIGUS 563 +#define SPECIES_TIRTOUGA 564 +#define SPECIES_CARRACOSTA 565 +#define SPECIES_ARCHEN 566 +#define SPECIES_ARCHEOPS 567 +#define SPECIES_TRUBBISH 568 +#define SPECIES_GARBODOR 569 +#define SPECIES_ZORUA 570 +#define SPECIES_ZOROARK 571 +#define SPECIES_MINCCINO 572 +#define SPECIES_CINCCINO 573 +#define SPECIES_GOTHITA 574 +#define SPECIES_GOTHORITA 575 +#define SPECIES_GOTHITELLE 576 +#define SPECIES_SOLOSIS 577 +#define SPECIES_DUOSION 578 +#define SPECIES_REUNICLUS 579 +#define SPECIES_DUCKLETT 580 +#define SPECIES_SWANNA 581 +#define SPECIES_VANILLITE 582 +#define SPECIES_VANILLISH 583 +#define SPECIES_VANILLUXE 584 +#define SPECIES_DEERLING SPECIES_DEERLING_SPRING +#define SPECIES_DEERLING_SPRING 585 +#define SPECIES_SAWSBUCK SPECIES_SAWSBUCK_SPRING +#define SPECIES_SAWSBUCK_SPRING 586 +#define SPECIES_EMOLGA 587 +#define SPECIES_KARRABLAST 588 +#define SPECIES_ESCAVALIER 589 +#define SPECIES_FOONGUS 590 +#define SPECIES_AMOONGUSS 591 +#define SPECIES_FRILLISH 592 +#define SPECIES_JELLICENT 593 +#define SPECIES_ALOMOMOLA 594 +#define SPECIES_JOLTIK 595 +#define SPECIES_GALVANTULA 596 +#define SPECIES_FERROSEED 597 +#define SPECIES_FERROTHORN 598 +#define SPECIES_KLINK 599 +#define SPECIES_KLANG 600 +#define SPECIES_KLINKLANG 601 +#define SPECIES_TYNAMO 602 +#define SPECIES_EELEKTRIK 603 +#define SPECIES_EELEKTROSS 604 +#define SPECIES_ELGYEM 605 +#define SPECIES_BEHEEYEM 606 +#define SPECIES_LITWICK 607 +#define SPECIES_LAMPENT 608 +#define SPECIES_CHANDELURE 609 +#define SPECIES_AXEW 610 +#define SPECIES_FRAXURE 611 +#define SPECIES_HAXORUS 612 +#define SPECIES_CUBCHOO 613 +#define SPECIES_BEARTIC 614 +#define SPECIES_CRYOGONAL 615 +#define SPECIES_SHELMET 616 +#define SPECIES_ACCELGOR 617 +#define SPECIES_STUNFISK 618 +#define SPECIES_MIENFOO 619 +#define SPECIES_MIENSHAO 620 +#define SPECIES_DRUDDIGON 621 +#define SPECIES_GOLETT 622 +#define SPECIES_GOLURK 623 +#define SPECIES_PAWNIARD 624 +#define SPECIES_BISHARP 625 +#define SPECIES_BOUFFALANT 626 +#define SPECIES_RUFFLET 627 +#define SPECIES_BRAVIARY 628 +#define SPECIES_VULLABY 629 +#define SPECIES_MANDIBUZZ 630 +#define SPECIES_HEATMOR 631 +#define SPECIES_DURANT 632 +#define SPECIES_DEINO 633 +#define SPECIES_ZWEILOUS 634 +#define SPECIES_HYDREIGON 635 +#define SPECIES_LARVESTA 636 +#define SPECIES_VOLCARONA 637 +#define SPECIES_COBALION 638 +#define SPECIES_TERRAKION 639 +#define SPECIES_VIRIZION 640 +#define SPECIES_TORNADUS SPECIES_TORNADUS_INCARNATE +#define SPECIES_TORNADUS_INCARNATE 641 +#define SPECIES_THUNDURUS SPECIES_THUNDURUS_INCARNATE +#define SPECIES_THUNDURUS_INCARNATE 642 +#define SPECIES_RESHIRAM 643 +#define SPECIES_ZEKROM 644 +#define SPECIES_LANDORUS SPECIES_LANDORUS_INCARNATE +#define SPECIES_LANDORUS_INCARNATE 645 +#define SPECIES_KYUREM 646 +#define SPECIES_KELDEO SPECIES_KELDEO_ORDINARY +#define SPECIES_KELDEO_ORDINARY 647 +#define SPECIES_MELOETTA SPECIES_MELOETTA_ARIA +#define SPECIES_MELOETTA_ARIA 648 +#define SPECIES_GENESECT 649 +#define SPECIES_CHESPIN 650 +#define SPECIES_QUILLADIN 651 +#define SPECIES_CHESNAUGHT 652 +#define SPECIES_FENNEKIN 653 +#define SPECIES_BRAIXEN 654 +#define SPECIES_DELPHOX 655 +#define SPECIES_FROAKIE 656 +#define SPECIES_FROGADIER 657 +#define SPECIES_GRENINJA 658 +#define SPECIES_BUNNELBY 659 +#define SPECIES_DIGGERSBY 660 +#define SPECIES_FLETCHLING 661 +#define SPECIES_FLETCHINDER 662 +#define SPECIES_TALONFLAME 663 +#define SPECIES_SCATTERBUG 664 +#define SPECIES_SPEWPA 665 +#define SPECIES_VIVILLON SPECIES_VIVILLON_ICY_SNOW +#define SPECIES_VIVILLON_ICY_SNOW 666 +#define SPECIES_LITLEO 667 +#define SPECIES_PYROAR 668 +#define SPECIES_FLABEBE SPECIES_FLABEBE_RED_FLOWER +#define SPECIES_FLABEBE_RED_FLOWER 669 +#define SPECIES_FLOETTE SPECIES_FLOETTE_RED_FLOWER +#define SPECIES_FLOETTE_RED_FLOWER 670 +#define SPECIES_FLORGES SPECIES_FLORGES_RED_FLOWER +#define SPECIES_FLORGES_RED_FLOWER 671 +#define SPECIES_SKIDDO 672 +#define SPECIES_GOGOAT 673 +#define SPECIES_PANCHAM 674 +#define SPECIES_PANGORO 675 +#define SPECIES_FURFROU SPECIES_FURFROU_NATURAL +#define SPECIES_FURFROU_NATURAL 676 +#define SPECIES_ESPURR 677 +#define SPECIES_MEOWSTIC SPECIES_MEOWSTIC_MALE +#define SPECIES_MEOWSTIC_MALE 678 +#define SPECIES_HONEDGE 679 +#define SPECIES_DOUBLADE 680 +#define SPECIES_AEGISLASH SPECIES_AEGISLASH_SHIELD +#define SPECIES_AEGISLASH_SHIELD 681 +#define SPECIES_SPRITZEE 682 +#define SPECIES_AROMATISSE 683 +#define SPECIES_SWIRLIX 684 +#define SPECIES_SLURPUFF 685 +#define SPECIES_INKAY 686 +#define SPECIES_MALAMAR 687 +#define SPECIES_BINACLE 688 +#define SPECIES_BARBARACLE 689 +#define SPECIES_SKRELP 690 +#define SPECIES_DRAGALGE 691 +#define SPECIES_CLAUNCHER 692 +#define SPECIES_CLAWITZER 693 +#define SPECIES_HELIOPTILE 694 +#define SPECIES_HELIOLISK 695 +#define SPECIES_TYRUNT 696 +#define SPECIES_TYRANTRUM 697 +#define SPECIES_AMAURA 698 +#define SPECIES_AURORUS 699 +#define SPECIES_SYLVEON 700 +#define SPECIES_HAWLUCHA 701 +#define SPECIES_DEDENNE 702 +#define SPECIES_CARBINK 703 +#define SPECIES_GOOMY 704 +#define SPECIES_SLIGGOO 705 +#define SPECIES_GOODRA 706 +#define SPECIES_KLEFKI 707 +#define SPECIES_PHANTUMP 708 +#define SPECIES_TREVENANT 709 +#define SPECIES_PUMPKABOO SPECIES_PUMPKABOO_AVERAGE +#define SPECIES_PUMPKABOO_AVERAGE 710 +#define SPECIES_GOURGEIST SPECIES_GOURGEIST_AVERAGE +#define SPECIES_GOURGEIST_AVERAGE 711 +#define SPECIES_BERGMITE 712 +#define SPECIES_AVALUGG 713 +#define SPECIES_NOIBAT 714 +#define SPECIES_NOIVERN 715 +#define SPECIES_XERNEAS SPECIES_XERNEAS_NEUTRAL +#define SPECIES_XERNEAS_NEUTRAL 716 +#define SPECIES_YVELTAL 717 +#define SPECIES_ZYGARDE SPECIES_ZYGARDE_50 +#define SPECIES_ZYGARDE_50 SPECIES_ZYGARDE_50_AURA_BREAK +#define SPECIES_ZYGARDE_50_AURA_BREAK 718 +#define SPECIES_DIANCIE 719 +#define SPECIES_HOOPA SPECIES_HOOPA_CONFINED +#define SPECIES_HOOPA_CONFINED 720 +#define SPECIES_VOLCANION 721 +#define SPECIES_ROWLET 722 +#define SPECIES_DARTRIX 723 +#define SPECIES_DECIDUEYE 724 +#define SPECIES_LITTEN 725 +#define SPECIES_TORRACAT 726 +#define SPECIES_INCINEROAR 727 +#define SPECIES_POPPLIO 728 +#define SPECIES_BRIONNE 729 +#define SPECIES_PRIMARINA 730 +#define SPECIES_PIKIPEK 731 +#define SPECIES_TRUMBEAK 732 +#define SPECIES_TOUCANNON 733 +#define SPECIES_YUNGOOS 734 +#define SPECIES_GUMSHOOS 735 +#define SPECIES_GRUBBIN 736 +#define SPECIES_CHARJABUG 737 +#define SPECIES_VIKAVOLT 738 +#define SPECIES_CRABRAWLER 739 +#define SPECIES_CRABOMINABLE 740 +#define SPECIES_ORICORIO SPECIES_ORICORIO_BAILE +#define SPECIES_ORICORIO_BAILE 741 +#define SPECIES_CUTIEFLY 742 +#define SPECIES_RIBOMBEE 743 +#define SPECIES_ROCKRUFF 744 +#define SPECIES_LYCANROC SPECIES_LYCANROC_MIDDAY +#define SPECIES_LYCANROC_MIDDAY 745 +#define SPECIES_WISHIWASHI SPECIES_WISHIWASHI_SOLO +#define SPECIES_WISHIWASHI_SOLO 746 +#define SPECIES_MAREANIE 747 +#define SPECIES_TOXAPEX 748 +#define SPECIES_MUDBRAY 749 +#define SPECIES_MUDSDALE 750 +#define SPECIES_DEWPIDER 751 +#define SPECIES_ARAQUANID 752 +#define SPECIES_FOMANTIS 753 +#define SPECIES_LURANTIS 754 +#define SPECIES_MORELULL 755 +#define SPECIES_SHIINOTIC 756 +#define SPECIES_SALANDIT 757 +#define SPECIES_SALAZZLE 758 +#define SPECIES_STUFFUL 759 +#define SPECIES_BEWEAR 760 +#define SPECIES_BOUNSWEET 761 +#define SPECIES_STEENEE 762 +#define SPECIES_TSAREENA 763 +#define SPECIES_COMFEY 764 +#define SPECIES_ORANGURU 765 +#define SPECIES_PASSIMIAN 766 +#define SPECIES_WIMPOD 767 +#define SPECIES_GOLISOPOD 768 +#define SPECIES_SANDYGAST 769 +#define SPECIES_PALOSSAND 770 +#define SPECIES_PYUKUMUKU 771 +#define SPECIES_TYPE_NULL 772 +#define SPECIES_SILVALLY SPECIES_SILVALLY_NORMAL +#define SPECIES_SILVALLY_NORMAL 773 +#define SPECIES_MINIOR SPECIES_MINIOR_METEOR +#define SPECIES_MINIOR_METEOR SPECIES_MINIOR_METEOR_RED +#define SPECIES_MINIOR_METEOR_RED 774 +#define SPECIES_KOMALA 775 +#define SPECIES_TURTONATOR 776 +#define SPECIES_TOGEDEMARU 777 +#define SPECIES_MIMIKYU SPECIES_MIMIKYU_DISGUISED +#define SPECIES_MIMIKYU_DISGUISED 778 +#define SPECIES_BRUXISH 779 +#define SPECIES_DRAMPA 780 +#define SPECIES_DHELMISE 781 +#define SPECIES_JANGMO_O 782 +#define SPECIES_HAKAMO_O 783 +#define SPECIES_KOMMO_O 784 +#define SPECIES_TAPU_KOKO 785 +#define SPECIES_TAPU_LELE 786 +#define SPECIES_TAPU_BULU 787 +#define SPECIES_TAPU_FINI 788 +#define SPECIES_COSMOG 789 +#define SPECIES_COSMOEM 790 +#define SPECIES_SOLGALEO 791 +#define SPECIES_LUNALA 792 +#define SPECIES_NIHILEGO 793 +#define SPECIES_BUZZWOLE 794 +#define SPECIES_PHEROMOSA 795 +#define SPECIES_XURKITREE 796 +#define SPECIES_CELESTEELA 797 +#define SPECIES_KARTANA 798 +#define SPECIES_GUZZLORD 799 +#define SPECIES_NECROZMA 800 +#define SPECIES_MAGEARNA 801 +#define SPECIES_MARSHADOW 802 +#define SPECIES_POIPOLE 803 +#define SPECIES_NAGANADEL 804 +#define SPECIES_STAKATAKA 805 +#define SPECIES_BLACEPHALON 806 +#define SPECIES_ZERAORA 807 +#define SPECIES_MELTAN 808 +#define SPECIES_MELMETAL 809 +#define SPECIES_GROOKEY 810 +#define SPECIES_THWACKEY 811 +#define SPECIES_RILLABOOM 812 +#define SPECIES_SCORBUNNY 813 +#define SPECIES_RABOOT 814 +#define SPECIES_CINDERACE 815 +#define SPECIES_SOBBLE 816 +#define SPECIES_DRIZZILE 817 +#define SPECIES_INTELEON 818 +#define SPECIES_SKWOVET 819 +#define SPECIES_GREEDENT 820 +#define SPECIES_ROOKIDEE 821 +#define SPECIES_CORVISQUIRE 822 +#define SPECIES_CORVIKNIGHT 823 +#define SPECIES_BLIPBUG 824 +#define SPECIES_DOTTLER 825 +#define SPECIES_ORBEETLE 826 +#define SPECIES_NICKIT 827 +#define SPECIES_THIEVUL 828 +#define SPECIES_GOSSIFLEUR 829 +#define SPECIES_ELDEGOSS 830 +#define SPECIES_WOOLOO 831 +#define SPECIES_DUBWOOL 832 +#define SPECIES_CHEWTLE 833 +#define SPECIES_DREDNAW 834 +#define SPECIES_YAMPER 835 +#define SPECIES_BOLTUND 836 +#define SPECIES_ROLYCOLY 837 +#define SPECIES_CARKOL 838 +#define SPECIES_COALOSSAL 839 +#define SPECIES_APPLIN 840 +#define SPECIES_FLAPPLE 841 +#define SPECIES_APPLETUN 842 +#define SPECIES_SILICOBRA 843 +#define SPECIES_SANDACONDA 844 +#define SPECIES_CRAMORANT 845 +#define SPECIES_ARROKUDA 846 +#define SPECIES_BARRASKEWDA 847 +#define SPECIES_TOXEL 848 +#define SPECIES_TOXTRICITY SPECIES_TOXTRICITY_AMPED +#define SPECIES_TOXTRICITY_AMPED 849 +#define SPECIES_SIZZLIPEDE 850 +#define SPECIES_CENTISKORCH 851 +#define SPECIES_CLOBBOPUS 852 +#define SPECIES_GRAPPLOCT 853 +#define SPECIES_SINISTEA SPECIES_SINISTEA_PHONY +#define SPECIES_SINISTEA_PHONY 854 +#define SPECIES_POLTEAGEIST SPECIES_POLTEAGEIST_PHONY +#define SPECIES_POLTEAGEIST_PHONY 855 +#define SPECIES_HATENNA 856 +#define SPECIES_HATTREM 857 +#define SPECIES_HATTERENE 858 +#define SPECIES_IMPIDIMP 859 +#define SPECIES_MORGREM 860 +#define SPECIES_GRIMMSNARL 861 +#define SPECIES_OBSTAGOON 862 +#define SPECIES_PERRSERKER 863 +#define SPECIES_CURSOLA 864 +#define SPECIES_SIRFETCHD 865 +#define SPECIES_MR_RIME 866 +#define SPECIES_RUNERIGUS 867 +#define SPECIES_MILCERY 868 +#define SPECIES_ALCREMIE SPECIES_ALCREMIE_STRAWBERRY +#define SPECIES_ALCREMIE_STRAWBERRY SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM +#define SPECIES_ALCREMIE_VANILLA_CREAM SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM +#define SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM 869 +#define SPECIES_FALINKS 870 +#define SPECIES_PINCURCHIN 871 +#define SPECIES_SNOM 872 +#define SPECIES_FROSMOTH 873 +#define SPECIES_STONJOURNER 874 +#define SPECIES_EISCUE SPECIES_EISCUE_ICE_FACE +#define SPECIES_EISCUE_ICE_FACE 875 +#define SPECIES_INDEEDEE SPECIES_INDEEDEE_MALE +#define SPECIES_INDEEDEE_MALE 876 +#define SPECIES_MORPEKO SPECIES_MORPEKO_FULL_BELLY +#define SPECIES_MORPEKO_FULL_BELLY 877 +#define SPECIES_CUFANT 878 +#define SPECIES_COPPERAJAH 879 +#define SPECIES_DRACOZOLT 880 +#define SPECIES_ARCTOZOLT 881 +#define SPECIES_DRACOVISH 882 +#define SPECIES_ARCTOVISH 883 +#define SPECIES_DURALUDON 884 +#define SPECIES_DREEPY 885 +#define SPECIES_DRAKLOAK 886 +#define SPECIES_DRAGAPULT 887 +#define SPECIES_ZACIAN SPECIES_ZACIAN_HERO_OF_MANY_BATTLES +#define SPECIES_ZACIAN_HERO_OF_MANY_BATTLES 888 +#define SPECIES_ZAMAZENTA SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES +#define SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES 889 +#define SPECIES_ETERNATUS 890 +#define SPECIES_KUBFU 891 +#define SPECIES_URSHIFU SPECIES_URSHIFU_SINGLE_STRIKE_STYLE +#define SPECIES_URSHIFU_SINGLE_STRIKE_STYLE 892 +#define SPECIES_ZARUDE 893 +#define SPECIES_REGIELEKI 894 +#define SPECIES_REGIDRAGO 895 +#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 SPECIES_BASCULEGION_MALE +#define SPECIES_BASCULEGION_MALE 902 +#define SPECIES_SNEASLER 903 +#define SPECIES_OVERQWIL 904 +#define SPECIES_ENAMORUS SPECIES_ENAMORUS_INCARNATE +#define SPECIES_ENAMORUS_INCARNATE 905 // Megas #define SPECIES_VENUSAUR_MEGA FORMS_START + 1 @@ -999,7 +1052,8 @@ #define SPECIES_ZIGZAGOON_GALARIAN FORMS_START + 82 #define SPECIES_LINOONE_GALARIAN FORMS_START + 83 #define SPECIES_DARUMAKA_GALARIAN FORMS_START + 84 -#define SPECIES_DARMANITAN_GALARIAN FORMS_START + 85 +#define SPECIES_DARMANITAN_GALARIAN SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE +#define SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE FORMS_START + 85 #define SPECIES_YAMASK_GALARIAN FORMS_START + 86 #define SPECIES_STUNFISK_GALARIAN FORMS_START + 87 @@ -1140,7 +1194,7 @@ // Darmanitan #define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 187 -#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 188 +#define SPECIES_DARMANITAN_GALARIAN_ZEN_MODE FORMS_START + 188 // Deerling #define SPECIES_DEERLING_SUMMER FORMS_START + 189 @@ -1249,7 +1303,8 @@ #define SPECIES_XERNEAS_ACTIVE FORMS_START + 258 // Zygarde -#define SPECIES_ZYGARDE_10 FORMS_START + 259 +#define SPECIES_ZYGARDE_10 SPECIES_ZYGARDE_10_AURA_BREAK +#define SPECIES_ZYGARDE_10_AURA_BREAK 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 @@ -1298,6 +1353,7 @@ #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 SPECIES_MINIOR_CORE_RED #define SPECIES_MINIOR_CORE_RED FORMS_START + 294 #define SPECIES_MINIOR_CORE_ORANGE FORMS_START + 295 #define SPECIES_MINIOR_CORE_YELLOW FORMS_START + 296 @@ -1331,14 +1387,22 @@ #define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 310 // Alcremie -#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 +#define SPECIES_ALCREMIE_RUBY_CREAM SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM +#define SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM FORMS_START + 311 +#define SPECIES_ALCREMIE_MATCHA_CREAM SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM +#define SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM FORMS_START + 312 +#define SPECIES_ALCREMIE_MINT_CREAM SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM +#define SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM FORMS_START + 313 +#define SPECIES_ALCREMIE_LEMON_CREAM SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM +#define SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM FORMS_START + 314 +#define SPECIES_ALCREMIE_SALTED_CREAM SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM +#define SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM FORMS_START + 315 +#define SPECIES_ALCREMIE_RUBY_SWIRL SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL +#define SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL FORMS_START + 316 +#define SPECIES_ALCREMIE_CARAMEL_SWIRL SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL +#define SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL FORMS_START + 317 +#define SPECIES_ALCREMIE_RAINBOW_SWIRL SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL +#define SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL FORMS_START + 318 // Eiscue #define SPECIES_EISCUE_NOICE_FACE FORMS_START + 319 @@ -1404,9 +1468,72 @@ #define SPECIES_ALCREMIE_GIGANTAMAX FORMS_START + 359 #define SPECIES_COPPERAJAH_GIGANTAMAX FORMS_START + 360 #define SPECIES_DURALUDON_GIGANTAMAX FORMS_START + 361 -#define SPECIES_URSHIFU_GIGANTAMAX FORMS_START + 362 +#define SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX FORMS_START + 362 #define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX FORMS_START + 363 +/* +#define SPECIES_ALCREMIE_BERRY SPECIES_ALCREMIE_BERRY_VANILLA_CREAM +#define SPECIES_ALCREMIE_BERRY_VANILLA_CREAM FORMS_START + 363 // Todo +#define SPECIES_ALCREMIE_BERRY_RUBY_CREAM FORMS_START + 364 // Todo +#define SPECIES_ALCREMIE_BERRY_MATCHA_CREAM FORMS_START + 365 // Todo +#define SPECIES_ALCREMIE_BERRY_MINT_CREAM FORMS_START + 366 // Todo +#define SPECIES_ALCREMIE_BERRY_LEMON_CREAM FORMS_START + 367 // Todo +#define SPECIES_ALCREMIE_BERRY_SALTED_CREAM FORMS_START + 368 // Todo +#define SPECIES_ALCREMIE_BERRY_RUBY_SWIRL FORMS_START + 369 // Todo +#define SPECIES_ALCREMIE_BERRY_CARAMEL_SWIRL FORMS_START + 370 // Todo +#define SPECIES_ALCREMIE_BERRY_RAINBOW_SWIRL FORMS_START + 371 // Todo +#define SPECIES_ALCREMIE_LOVE SPECIES_ALCREMIE_LOVE_VANILLA_CREAM +#define SPECIES_ALCREMIE_LOVE_VANILLA_CREAM FORMS_START + 372 // Todo +#define SPECIES_ALCREMIE_LOVE_RUBY_CREAM FORMS_START + 373 // Todo +#define SPECIES_ALCREMIE_LOVE_MATCHA_CREAM FORMS_START + 374 // Todo +#define SPECIES_ALCREMIE_LOVE_MINT_CREAM FORMS_START + 375 // Todo +#define SPECIES_ALCREMIE_LOVE_LEMON_CREAM FORMS_START + 376 // Todo +#define SPECIES_ALCREMIE_LOVE_SALTED_CREAM FORMS_START + 377 // Todo +#define SPECIES_ALCREMIE_LOVE_RUBY_SWIRL FORMS_START + 378 // Todo +#define SPECIES_ALCREMIE_LOVE_CARAMEL_SWIRL FORMS_START + 379 // Todo +#define SPECIES_ALCREMIE_LOVE_RAINBOW_SWIRL FORMS_START + 380 // Todo +#define SPECIES_ALCREMIE_STAR SPECIES_ALCREMIE_STAR_VANILLA_CREAM +#define SPECIES_ALCREMIE_STAR_VANILLA_CREAM FORMS_START + 381 // Todo +#define SPECIES_ALCREMIE_STAR_RUBY_CREAM FORMS_START + 382 // Todo +#define SPECIES_ALCREMIE_STAR_MATCHA_CREAM FORMS_START + 383 // Todo +#define SPECIES_ALCREMIE_STAR_MINT_CREAM FORMS_START + 384 // Todo +#define SPECIES_ALCREMIE_STAR_LEMON_CREAM FORMS_START + 385 // Todo +#define SPECIES_ALCREMIE_STAR_SALTED_CREAM FORMS_START + 386 // Todo +#define SPECIES_ALCREMIE_STAR_RUBY_SWIRL FORMS_START + 387 // Todo +#define SPECIES_ALCREMIE_STAR_CARAMEL_SWIRL FORMS_START + 388 // Todo +#define SPECIES_ALCREMIE_STAR_RAINBOW_SWIRL FORMS_START + 389 // Todo +#define SPECIES_ALCREMIE_CLOVER SPECIES_ALCREMIE_CLOVER_VANILLA_CREAM +#define SPECIES_ALCREMIE_CLOVER_VANILLA_CREAM FORMS_START + 390 // Todo +#define SPECIES_ALCREMIE_CLOVER_RUBY_CREAM FORMS_START + 391 // Todo +#define SPECIES_ALCREMIE_CLOVER_MATCHA_CREAM FORMS_START + 392 // Todo +#define SPECIES_ALCREMIE_CLOVER_MINT_CREAM FORMS_START + 393 // Todo +#define SPECIES_ALCREMIE_CLOVER_LEMON_CREAM FORMS_START + 394 // Todo +#define SPECIES_ALCREMIE_CLOVER_SALTED_CREAM FORMS_START + 395 // Todo +#define SPECIES_ALCREMIE_CLOVER_RUBY_SWIRL FORMS_START + 396 // Todo +#define SPECIES_ALCREMIE_CLOVER_CARAMEL_SWIRL FORMS_START + 397 // Todo +#define SPECIES_ALCREMIE_CLOVER_RAINBOW_SWIRL FORMS_START + 398 // Todo +#define SPECIES_ALCREMIE_FLOWER SPECIES_ALCREMIE_FLOWER_VANILLA_CREAM +#define SPECIES_ALCREMIE_FLOWER_VANILLA_CREAM FORMS_START + 399 // Todo +#define SPECIES_ALCREMIE_FLOWER_RUBY_CREAM FORMS_START + 400 // Todo +#define SPECIES_ALCREMIE_FLOWER_MATCHA_CREAM FORMS_START + 401 // Todo +#define SPECIES_ALCREMIE_FLOWER_MINT_CREAM FORMS_START + 402 // Todo +#define SPECIES_ALCREMIE_FLOWER_LEMON_CREAM FORMS_START + 403 // Todo +#define SPECIES_ALCREMIE_FLOWER_SALTED_CREAM FORMS_START + 404 // Todo +#define SPECIES_ALCREMIE_FLOWER_RUBY_SWIRL FORMS_START + 405 // Todo +#define SPECIES_ALCREMIE_FLOWER_CARAMEL_SWIRL FORMS_START + 406 // Todo +#define SPECIES_ALCREMIE_FLOWER_RAINBOW_SWIRL FORMS_START + 407 // Todo +#define SPECIES_ALCREMIE_RIBBON SPECIES_ALCREMIE_RIBBON_VANILLA_CREAM +#define SPECIES_ALCREMIE_RIBBON_VANILLA_CREAM FORMS_START + 408 // Todo +#define SPECIES_ALCREMIE_RIBBON_RUBY_CREAM FORMS_START + 409 // Todo +#define SPECIES_ALCREMIE_RIBBON_MATCHA_CREAM FORMS_START + 410 // Todo +#define SPECIES_ALCREMIE_RIBBON_MINT_CREAM FORMS_START + 411 // Todo +#define SPECIES_ALCREMIE_RIBBON_LEMON_CREAM FORMS_START + 412 // Todo +#define SPECIES_ALCREMIE_RIBBON_SALTED_CREAM FORMS_START + 413 // Todo +#define SPECIES_ALCREMIE_RIBBON_RUBY_SWIRL FORMS_START + 414 // Todo +#define SPECIES_ALCREMIE_RIBBON_CARAMEL_SWIRL FORMS_START + 415 // Todo +#define SPECIES_ALCREMIE_RIBBON_RAINBOW_SWIRL FORMS_START + 416 // Todo +*/ + #define FORMS_START SPECIES_ENAMORUS #define SPECIES_EGG SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX + 1 diff --git a/include/graphics.h b/include/graphics.h index f33955898e..f2ff391a95 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -478,7 +478,7 @@ extern const u32 gMonFrontPic_Armaldo[]; extern const u32 gMonFrontPic_Feebas[]; extern const u32 gMonFrontPic_Milotic[]; extern const u32 gMonFrontPic_MiloticF[]; -extern const u32 gMonFrontPic_Castform[]; +extern const u32 gMonFrontPic_CastformNormal[]; extern const u32 gMonFrontPic_Kecleon[]; extern const u32 gMonFrontPic_Shuppet[]; extern const u32 gMonFrontPic_Banette[]; @@ -514,7 +514,7 @@ extern const u32 gMonFrontPic_Kyogre[]; extern const u32 gMonFrontPic_Groudon[]; extern const u32 gMonFrontPic_Rayquaza[]; extern const u32 gMonFrontPic_Jirachi[]; -extern const u32 gMonFrontPic_Deoxys[]; +extern const u32 gMonFrontPic_DeoxysNormal[]; #if P_GEN_4_POKEMON == TRUE extern const u32 gMonFrontPic_Turtwig[]; extern const u32 gMonFrontPic_Grotle[]; @@ -552,8 +552,8 @@ extern const u32 gMonFrontPic_Cranidos[]; extern const u32 gMonFrontPic_Rampardos[]; extern const u32 gMonFrontPic_Shieldon[]; extern const u32 gMonFrontPic_Bastiodon[]; -extern const u32 gMonFrontPic_Burmy[]; -extern const u32 gMonFrontPic_Wormadam[]; +extern const u32 gMonFrontPic_BurmyPlantCloak[]; +extern const u32 gMonFrontPic_WormadamPlantCloak[]; extern const u32 gMonFrontPic_Mothim[]; extern const u32 gMonFrontPic_Combee[]; extern const u32 gMonFrontPic_Vespiquen[]; @@ -562,9 +562,9 @@ extern const u32 gMonFrontPic_PachirisuF[]; extern const u32 gMonFrontPic_Buizel[]; extern const u32 gMonFrontPic_Floatzel[]; extern const u32 gMonFrontPic_Cherubi[]; -extern const u32 gMonFrontPic_Cherrim[]; -extern const u32 gMonFrontPic_Shellos[]; -extern const u32 gMonFrontPic_Gastrodon[]; +extern const u32 gMonFrontPic_CherrimOvercast[]; +extern const u32 gMonFrontPic_ShellosWestSea[]; +extern const u32 gMonFrontPic_GastrodonWestSea[]; extern const u32 gMonFrontPic_Ambipom[]; extern const u32 gMonFrontPic_AmbipomF[]; extern const u32 gMonFrontPic_Drifloon[]; @@ -642,12 +642,12 @@ extern const u32 gMonFrontPic_Dialga[]; extern const u32 gMonFrontPic_Palkia[]; extern const u32 gMonFrontPic_Heatran[]; extern const u32 gMonFrontPic_Regigigas[]; -extern const u32 gMonFrontPic_Giratina[]; +extern const u32 gMonFrontPic_GiratinaAltered[]; extern const u32 gMonFrontPic_Cresselia[]; extern const u32 gMonFrontPic_Phione[]; extern const u32 gMonFrontPic_Manaphy[]; extern const u32 gMonFrontPic_Darkrai[]; -extern const u32 gMonFrontPic_Shaymin[]; +extern const u32 gMonFrontPic_ShayminLand[]; extern const u32 gMonFrontPic_Arceus[]; #endif #if P_GEN_5_POKEMON == TRUE @@ -708,12 +708,12 @@ extern const u32 gMonFrontPic_Cottonee[]; extern const u32 gMonFrontPic_Whimsicott[]; extern const u32 gMonFrontPic_Petilil[]; extern const u32 gMonFrontPic_Lilligant[]; -extern const u32 gMonFrontPic_Basculin[]; +extern const u32 gMonFrontPic_BasculinRedStriped[]; extern const u32 gMonFrontPic_Sandile[]; extern const u32 gMonFrontPic_Krokorok[]; extern const u32 gMonFrontPic_Krookodile[]; extern const u32 gMonFrontPic_Darumaka[]; -extern const u32 gMonFrontPic_Darmanitan[]; +extern const u32 gMonFrontPic_DarmanitanStandardMode[]; extern const u32 gMonFrontPic_Maractus[]; extern const u32 gMonFrontPic_Dwebble[]; extern const u32 gMonFrontPic_Crustle[]; @@ -744,7 +744,7 @@ extern const u32 gMonFrontPic_Vanillite[]; extern const u32 gMonFrontPic_Vanillish[]; extern const u32 gMonFrontPic_Vanilluxe[]; extern const u32 gMonFrontPic_Deerling[]; -extern const u32 gMonFrontPic_Sawsbuck[]; +extern const u32 gMonFrontPic_SawsbuckSpring[]; extern const u32 gMonFrontPic_Emolga[]; extern const u32 gMonFrontPic_Karrablast[]; extern const u32 gMonFrontPic_Escavalier[]; @@ -801,14 +801,14 @@ extern const u32 gMonFrontPic_Volcarona[]; extern const u32 gMonFrontPic_Cobalion[]; extern const u32 gMonFrontPic_Terrakion[]; extern const u32 gMonFrontPic_Virizion[]; -extern const u32 gMonFrontPic_Tornadus[]; -extern const u32 gMonFrontPic_Thundurus[]; +extern const u32 gMonFrontPic_TornadusIncarnate[]; +extern const u32 gMonFrontPic_ThundurusIncarnate[]; extern const u32 gMonFrontPic_Reshiram[]; extern const u32 gMonFrontPic_Zekrom[]; -extern const u32 gMonFrontPic_Landorus[]; +extern const u32 gMonFrontPic_LandorusIncarnate[]; extern const u32 gMonFrontPic_Kyurem[]; -extern const u32 gMonFrontPic_Keldeo[]; -extern const u32 gMonFrontPic_Meloetta[]; +extern const u32 gMonFrontPic_KeldeoOrdinary[]; +extern const u32 gMonFrontPic_MeloettaAria[]; extern const u32 gMonFrontPic_Genesect[]; #endif #if P_GEN_6_POKEMON == TRUE @@ -828,7 +828,7 @@ extern const u32 gMonFrontPic_Fletchinder[]; extern const u32 gMonFrontPic_Talonflame[]; extern const u32 gMonFrontPic_Scatterbug[]; extern const u32 gMonFrontPic_Spewpa[]; -extern const u32 gMonFrontPic_Vivillon[]; +extern const u32 gMonFrontPic_VivillonIcySnow[]; extern const u32 gMonFrontPic_Litleo[]; extern const u32 gMonFrontPic_Pyroar[]; extern const u32 gMonFrontPic_PyroarF[]; @@ -839,12 +839,12 @@ extern const u32 gMonFrontPic_Skiddo[]; extern const u32 gMonFrontPic_Gogoat[]; extern const u32 gMonFrontPic_Pancham[]; extern const u32 gMonFrontPic_Pangoro[]; -extern const u32 gMonFrontPic_Furfrou[]; +extern const u32 gMonFrontPic_FurfrouNatural[]; extern const u32 gMonFrontPic_Espurr[]; -extern const u32 gMonFrontPic_Meowstic[]; +extern const u32 gMonFrontPic_MeowsticMale[]; extern const u32 gMonFrontPic_Honedge[]; extern const u32 gMonFrontPic_Doublade[]; -extern const u32 gMonFrontPic_Aegislash[]; +extern const u32 gMonFrontPic_AegislashShield[]; extern const u32 gMonFrontPic_Spritzee[]; extern const u32 gMonFrontPic_Aromatisse[]; extern const u32 gMonFrontPic_Swirlix[]; @@ -873,17 +873,17 @@ extern const u32 gMonFrontPic_Goodra[]; extern const u32 gMonFrontPic_Klefki[]; extern const u32 gMonFrontPic_Phantump[]; extern const u32 gMonFrontPic_Trevenant[]; -extern const u32 gMonFrontPic_Pumpkaboo[]; -extern const u32 gMonFrontPic_Gourgeist[]; +extern const u32 gMonFrontPic_PumpkabooAverage[]; +extern const u32 gMonFrontPic_GourgeistAverage[]; extern const u32 gMonFrontPic_Bergmite[]; extern const u32 gMonFrontPic_Avalugg[]; extern const u32 gMonFrontPic_Noibat[]; extern const u32 gMonFrontPic_Noivern[]; -extern const u32 gMonFrontPic_Xerneas[]; +extern const u32 gMonFrontPic_XerneasNeutral[]; extern const u32 gMonFrontPic_Yveltal[]; -extern const u32 gMonFrontPic_Zygarde[]; +extern const u32 gMonFrontPic_Zygarde50[]; extern const u32 gMonFrontPic_Diancie[]; -extern const u32 gMonFrontPic_Hoopa[]; +extern const u32 gMonFrontPic_HoopaConfined[]; extern const u32 gMonFrontPic_Volcanion[]; #endif #if P_GEN_7_POKEMON == TRUE @@ -906,12 +906,12 @@ extern const u32 gMonFrontPic_Charjabug[]; extern const u32 gMonFrontPic_Vikavolt[]; extern const u32 gMonFrontPic_Crabrawler[]; extern const u32 gMonFrontPic_Crabominable[]; -extern const u32 gMonFrontPic_Oricorio[]; +extern const u32 gMonFrontPic_OricorioBaile[]; extern const u32 gMonFrontPic_Cutiefly[]; extern const u32 gMonFrontPic_Ribombee[]; extern const u32 gMonFrontPic_Rockruff[]; -extern const u32 gMonFrontPic_Lycanroc[]; -extern const u32 gMonFrontPic_Wishiwashi[]; +extern const u32 gMonFrontPic_LycanrocMidday[]; +extern const u32 gMonFrontPic_WishiwashiSolo[]; extern const u32 gMonFrontPic_Mareanie[]; extern const u32 gMonFrontPic_Toxapex[]; extern const u32 gMonFrontPic_Mudbray[]; @@ -939,11 +939,11 @@ extern const u32 gMonFrontPic_Palossand[]; extern const u32 gMonFrontPic_Pyukumuku[]; extern const u32 gMonFrontPic_TypeNull[]; extern const u32 gMonFrontPic_Silvally[]; -extern const u32 gMonFrontPic_Minior[]; +extern const u32 gMonFrontPic_MiniorMeteor[]; extern const u32 gMonFrontPic_Komala[]; extern const u32 gMonFrontPic_Turtonator[]; extern const u32 gMonFrontPic_Togedemaru[]; -extern const u32 gMonFrontPic_Mimikyu[]; +extern const u32 gMonFrontPic_MimikyuDisguised[]; extern const u32 gMonFrontPic_Bruxish[]; extern const u32 gMonFrontPic_Drampa[]; extern const u32 gMonFrontPic_Dhelmise[]; @@ -1016,7 +1016,7 @@ extern const u32 gMonFrontPic_Cramorant[]; extern const u32 gMonFrontPic_Arrokuda[]; extern const u32 gMonFrontPic_Barraskewda[]; extern const u32 gMonFrontPic_Toxel[]; -extern const u32 gMonFrontPic_Toxtricity[]; +extern const u32 gMonFrontPic_ToxtricityAmped[]; extern const u32 gMonFrontPic_Sizzlipede[]; extern const u32 gMonFrontPic_Centiskorch[]; extern const u32 gMonFrontPic_Clobbopus[]; @@ -1042,9 +1042,9 @@ extern const u32 gMonFrontPic_Pincurchin[]; extern const u32 gMonFrontPic_Snom[]; extern const u32 gMonFrontPic_Frosmoth[]; extern const u32 gMonFrontPic_Stonjourner[]; -extern const u32 gMonFrontPic_Eiscue[]; -extern const u32 gMonFrontPic_Indeedee[]; -extern const u32 gMonFrontPic_Morpeko[]; +extern const u32 gMonFrontPic_EiscueFace[]; +extern const u32 gMonFrontPic_IndeedeeMale[]; +extern const u32 gMonFrontPic_MorpekoFullBelly[]; extern const u32 gMonFrontPic_Cufant[]; extern const u32 gMonFrontPic_Copperajah[]; extern const u32 gMonFrontPic_Dracozolt[]; @@ -1055,11 +1055,11 @@ extern const u32 gMonFrontPic_Duraludon[]; extern const u32 gMonFrontPic_Dreepy[]; extern const u32 gMonFrontPic_Drakloak[]; extern const u32 gMonFrontPic_Dragapult[]; -extern const u32 gMonFrontPic_Zacian[]; -extern const u32 gMonFrontPic_Zamazenta[]; +extern const u32 gMonFrontPic_ZacianHeroOfManyBattles[]; +extern const u32 gMonFrontPic_ZamazentaHeroOfManyBattles[]; extern const u32 gMonFrontPic_Eternatus[]; extern const u32 gMonFrontPic_Kubfu[]; -extern const u32 gMonFrontPic_Urshifu[]; +extern const u32 gMonFrontPic_UrshifuSingleStrikeStyle[]; extern const u32 gMonFrontPic_Zarude[]; extern const u32 gMonFrontPic_Regieleki[]; extern const u32 gMonFrontPic_Regidrago[]; @@ -1069,10 +1069,10 @@ 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_BasculegionMale[]; extern const u32 gMonFrontPic_Sneasler[]; extern const u32 gMonFrontPic_Overqwil[]; -extern const u32 gMonFrontPic_Enamorus[]; +extern const u32 gMonFrontPic_EnamorusIncarnate[]; #endif extern const u32 gMonFrontPic_VenusaurMega[]; extern const u32 gMonFrontPic_CharizardMegaX[]; @@ -1165,7 +1165,7 @@ extern const u32 gMonFrontPic_ZigzagoonGalarian[]; extern const u32 gMonFrontPic_LinooneGalarian[]; #if P_GEN_5_POKEMON == TRUE extern const u32 gMonFrontPic_DarumakaGalarian[]; -extern const u32 gMonFrontPic_DarmanitanGalarian[]; +extern const u32 gMonFrontPic_DarmanitanGalarianStandardMode[]; extern const u32 gMonFrontPic_YamaskGalarian[]; extern const u32 gMonFrontPic_StunfiskGalarian[]; #endif @@ -1262,7 +1262,7 @@ 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_DarmanitanGalarianZenMode[]; extern const u32 gMonFrontPic_SawsbuckSummer[]; extern const u32 gMonFrontPic_SawsbuckAutumn[]; extern const u32 gMonFrontPic_SawsbuckWinter[]; @@ -1770,7 +1770,7 @@ extern const u32 gMonBackPic_Armaldo[]; extern const u32 gMonBackPic_Feebas[]; extern const u32 gMonBackPic_Milotic[]; extern const u32 gMonBackPic_MiloticF[]; -extern const u32 gMonBackPic_Castform[]; +extern const u32 gMonBackPic_CastformNormal[]; extern const u32 gMonBackPic_Kecleon[]; extern const u32 gMonBackPic_Shuppet[]; extern const u32 gMonBackPic_Banette[]; @@ -1806,7 +1806,7 @@ extern const u32 gMonBackPic_Kyogre[]; extern const u32 gMonBackPic_Groudon[]; extern const u32 gMonBackPic_Rayquaza[]; extern const u32 gMonBackPic_Jirachi[]; -extern const u32 gMonBackPic_Deoxys[]; +extern const u32 gMonBackPic_DeoxysNormal[]; #if P_GEN_4_POKEMON == TRUE extern const u32 gMonBackPic_Turtwig[]; extern const u32 gMonBackPic_Grotle[]; @@ -1842,8 +1842,8 @@ extern const u32 gMonBackPic_Cranidos[]; extern const u32 gMonBackPic_Rampardos[]; extern const u32 gMonBackPic_Shieldon[]; extern const u32 gMonBackPic_Bastiodon[]; -extern const u32 gMonBackPic_Burmy[]; -extern const u32 gMonBackPic_Wormadam[]; +extern const u32 gMonBackPic_BurmyPlantCloak[]; +extern const u32 gMonBackPic_WormadamPlantCloak[]; extern const u32 gMonBackPic_Mothim[]; extern const u32 gMonBackPic_Combee[]; extern const u32 gMonBackPic_Vespiquen[]; @@ -1853,9 +1853,9 @@ extern const u32 gMonBackPic_BuizelF[]; extern const u32 gMonBackPic_Floatzel[]; extern const u32 gMonBackPic_FloatzelF[]; extern const u32 gMonBackPic_Cherubi[]; -extern const u32 gMonBackPic_Cherrim[]; -extern const u32 gMonBackPic_Shellos[]; -extern const u32 gMonBackPic_Gastrodon[]; +extern const u32 gMonBackPic_CherrimOvercast[]; +extern const u32 gMonBackPic_ShellosWestSea[]; +extern const u32 gMonBackPic_GastrodonWestSea[]; extern const u32 gMonBackPic_Ambipom[]; extern const u32 gMonBackPic_AmbipomF[]; extern const u32 gMonBackPic_Drifloon[]; @@ -1929,12 +1929,12 @@ extern const u32 gMonBackPic_Dialga[]; extern const u32 gMonBackPic_Palkia[]; extern const u32 gMonBackPic_Heatran[]; extern const u32 gMonBackPic_Regigigas[]; -extern const u32 gMonBackPic_Giratina[]; +extern const u32 gMonBackPic_GiratinaAltered[]; extern const u32 gMonBackPic_Cresselia[]; extern const u32 gMonBackPic_Phione[]; extern const u32 gMonBackPic_Manaphy[]; extern const u32 gMonBackPic_Darkrai[]; -extern const u32 gMonBackPic_Shaymin[]; +extern const u32 gMonBackPic_ShayminLand[]; extern const u32 gMonBackPic_Arceus[]; #endif #if P_GEN_5_POKEMON == TRUE @@ -1995,12 +1995,12 @@ extern const u32 gMonBackPic_Cottonee[]; extern const u32 gMonBackPic_Whimsicott[]; extern const u32 gMonBackPic_Petilil[]; extern const u32 gMonBackPic_Lilligant[]; -extern const u32 gMonBackPic_Basculin[]; +extern const u32 gMonBackPic_BasculinRedStriped[]; extern const u32 gMonBackPic_Sandile[]; extern const u32 gMonBackPic_Krokorok[]; extern const u32 gMonBackPic_Krookodile[]; extern const u32 gMonBackPic_Darumaka[]; -extern const u32 gMonBackPic_Darmanitan[]; +extern const u32 gMonBackPic_DarmanitanStandardMode[]; extern const u32 gMonBackPic_Maractus[]; extern const u32 gMonBackPic_Dwebble[]; extern const u32 gMonBackPic_Crustle[]; @@ -2031,7 +2031,7 @@ extern const u32 gMonBackPic_Vanillite[]; extern const u32 gMonBackPic_Vanillish[]; extern const u32 gMonBackPic_Vanilluxe[]; extern const u32 gMonBackPic_Deerling[]; -extern const u32 gMonBackPic_Sawsbuck[]; +extern const u32 gMonBackPic_SawsbuckSpring[]; extern const u32 gMonBackPic_Emolga[]; extern const u32 gMonBackPic_Karrablast[]; extern const u32 gMonBackPic_Escavalier[]; @@ -2088,14 +2088,14 @@ extern const u32 gMonBackPic_Volcarona[]; extern const u32 gMonBackPic_Cobalion[]; extern const u32 gMonBackPic_Terrakion[]; extern const u32 gMonBackPic_Virizion[]; -extern const u32 gMonBackPic_Tornadus[]; -extern const u32 gMonBackPic_Thundurus[]; +extern const u32 gMonBackPic_TornadusIncarnate[]; +extern const u32 gMonBackPic_ThundurusIncarnate[]; extern const u32 gMonBackPic_Reshiram[]; extern const u32 gMonBackPic_Zekrom[]; -extern const u32 gMonBackPic_Landorus[]; +extern const u32 gMonBackPic_LandorusIncarnate[]; extern const u32 gMonBackPic_Kyurem[]; -extern const u32 gMonBackPic_Keldeo[]; -extern const u32 gMonBackPic_Meloetta[]; +extern const u32 gMonBackPic_KeldeoOrdinary[]; +extern const u32 gMonBackPic_MeloettaAria[]; extern const u32 gMonBackPic_Genesect[]; #endif #if P_GEN_6_POKEMON == TRUE @@ -2115,7 +2115,7 @@ extern const u32 gMonBackPic_Fletchinder[]; extern const u32 gMonBackPic_Talonflame[]; extern const u32 gMonBackPic_Scatterbug[]; extern const u32 gMonBackPic_Spewpa[]; -extern const u32 gMonBackPic_Vivillon[]; +extern const u32 gMonBackPic_VivillonIcySnow[]; extern const u32 gMonBackPic_Litleo[]; extern const u32 gMonBackPic_Pyroar[]; extern const u32 gMonBackPic_PyroarF[]; @@ -2126,12 +2126,12 @@ extern const u32 gMonBackPic_Skiddo[]; extern const u32 gMonBackPic_Gogoat[]; extern const u32 gMonBackPic_Pancham[]; extern const u32 gMonBackPic_Pangoro[]; -extern const u32 gMonBackPic_Furfrou[]; +extern const u32 gMonBackPic_FurfrouNatural[]; extern const u32 gMonBackPic_Espurr[]; -extern const u32 gMonBackPic_Meowstic[]; +extern const u32 gMonBackPic_MeowsticMale[]; extern const u32 gMonBackPic_Honedge[]; extern const u32 gMonBackPic_Doublade[]; -extern const u32 gMonBackPic_Aegislash[]; +extern const u32 gMonBackPic_AegislashShield[]; extern const u32 gMonBackPic_Spritzee[]; extern const u32 gMonBackPic_Aromatisse[]; extern const u32 gMonBackPic_Swirlix[]; @@ -2160,17 +2160,17 @@ extern const u32 gMonBackPic_Goodra[]; extern const u32 gMonBackPic_Klefki[]; extern const u32 gMonBackPic_Phantump[]; extern const u32 gMonBackPic_Trevenant[]; -extern const u32 gMonBackPic_Pumpkaboo[]; -extern const u32 gMonBackPic_Gourgeist[]; +extern const u32 gMonBackPic_PumpkabooAverage[]; +extern const u32 gMonBackPic_GourgeistAverage[]; extern const u32 gMonBackPic_Bergmite[]; extern const u32 gMonBackPic_Avalugg[]; extern const u32 gMonBackPic_Noibat[]; extern const u32 gMonBackPic_Noivern[]; -extern const u32 gMonBackPic_Xerneas[]; +extern const u32 gMonBackPic_XerneasNeutral[]; extern const u32 gMonBackPic_Yveltal[]; -extern const u32 gMonBackPic_Zygarde[]; +extern const u32 gMonBackPic_Zygarde50[]; extern const u32 gMonBackPic_Diancie[]; -extern const u32 gMonBackPic_Hoopa[]; +extern const u32 gMonBackPic_HoopaConfined[]; extern const u32 gMonBackPic_Volcanion[]; #endif #if P_GEN_7_POKEMON == TRUE @@ -2193,12 +2193,12 @@ extern const u32 gMonBackPic_Charjabug[]; extern const u32 gMonBackPic_Vikavolt[]; extern const u32 gMonBackPic_Crabrawler[]; extern const u32 gMonBackPic_Crabominable[]; -extern const u32 gMonBackPic_Oricorio[]; +extern const u32 gMonBackPic_OricorioBaile[]; extern const u32 gMonBackPic_Cutiefly[]; extern const u32 gMonBackPic_Ribombee[]; extern const u32 gMonBackPic_Rockruff[]; -extern const u32 gMonBackPic_Lycanroc[]; -extern const u32 gMonBackPic_Wishiwashi[]; +extern const u32 gMonBackPic_LycanrocMidday[]; +extern const u32 gMonBackPic_WishiwashiSolo[]; extern const u32 gMonBackPic_Mareanie[]; extern const u32 gMonBackPic_Toxapex[]; extern const u32 gMonBackPic_Mudbray[]; @@ -2226,11 +2226,11 @@ extern const u32 gMonBackPic_Palossand[]; extern const u32 gMonBackPic_Pyukumuku[]; extern const u32 gMonBackPic_TypeNull[]; extern const u32 gMonBackPic_Silvally[]; -extern const u32 gMonBackPic_Minior[]; +extern const u32 gMonBackPic_MiniorMeteor[]; extern const u32 gMonBackPic_Komala[]; extern const u32 gMonBackPic_Turtonator[]; extern const u32 gMonBackPic_Togedemaru[]; -extern const u32 gMonBackPic_Mimikyu[]; +extern const u32 gMonBackPic_MimikyuDisguised[]; extern const u32 gMonBackPic_Bruxish[]; extern const u32 gMonBackPic_Drampa[]; extern const u32 gMonBackPic_Dhelmise[]; @@ -2303,7 +2303,7 @@ extern const u32 gMonBackPic_Cramorant[]; extern const u32 gMonBackPic_Arrokuda[]; extern const u32 gMonBackPic_Barraskewda[]; extern const u32 gMonBackPic_Toxel[]; -extern const u32 gMonBackPic_Toxtricity[]; +extern const u32 gMonBackPic_ToxtricityAmped[]; extern const u32 gMonBackPic_Sizzlipede[]; extern const u32 gMonBackPic_Centiskorch[]; extern const u32 gMonBackPic_Clobbopus[]; @@ -2329,9 +2329,9 @@ extern const u32 gMonBackPic_Pincurchin[]; extern const u32 gMonBackPic_Snom[]; extern const u32 gMonBackPic_Frosmoth[]; extern const u32 gMonBackPic_Stonjourner[]; -extern const u32 gMonBackPic_Eiscue[]; -extern const u32 gMonBackPic_Indeedee[]; -extern const u32 gMonBackPic_Morpeko[]; +extern const u32 gMonBackPic_EiscueIceFace[]; +extern const u32 gMonBackPic_IndeedeeMale[]; +extern const u32 gMonBackPic_MorpekoFullBelly[]; extern const u32 gMonBackPic_Cufant[]; extern const u32 gMonBackPic_Copperajah[]; extern const u32 gMonBackPic_Dracozolt[]; @@ -2342,11 +2342,11 @@ extern const u32 gMonBackPic_Duraludon[]; extern const u32 gMonBackPic_Dreepy[]; extern const u32 gMonBackPic_Drakloak[]; extern const u32 gMonBackPic_Dragapult[]; -extern const u32 gMonBackPic_Zacian[]; -extern const u32 gMonBackPic_Zamazenta[]; +extern const u32 gMonBackPic_ZacianHeroOfManyBattles[]; +extern const u32 gMonBackPic_ZamazentaHeroOfManyBattles[]; extern const u32 gMonBackPic_Eternatus[]; extern const u32 gMonBackPic_Kubfu[]; -extern const u32 gMonBackPic_Urshifu[]; +extern const u32 gMonBackPic_UrshifuSingleStrikeStyle[]; extern const u32 gMonBackPic_Zarude[]; extern const u32 gMonBackPic_Regieleki[]; extern const u32 gMonBackPic_Regidrago[]; @@ -2356,10 +2356,10 @@ 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_BasculegionMale[]; extern const u32 gMonBackPic_Sneasler[]; extern const u32 gMonBackPic_Overqwil[]; -extern const u32 gMonBackPic_Enamorus[]; +extern const u32 gMonBackPic_EnamorusIncarnate[]; #endif extern const u32 gMonBackPic_VenusaurMega[]; extern const u32 gMonBackPic_CharizardMegaX[]; @@ -2452,7 +2452,7 @@ extern const u32 gMonBackPic_ZigzagoonGalarian[]; extern const u32 gMonBackPic_LinooneGalarian[]; #if P_GEN_5_POKEMON == TRUE extern const u32 gMonBackPic_DarumakaGalarian[]; -extern const u32 gMonBackPic_DarmanitanGalarian[]; +extern const u32 gMonBackPic_DarmanitanGalarianStandardMode[]; extern const u32 gMonBackPic_YamaskGalarian[]; extern const u32 gMonBackPic_StunfiskGalarian[]; #endif @@ -2549,7 +2549,7 @@ 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_DarmanitanGalarianZenMode[]; extern const u32 gMonBackPic_SawsbuckSummer[]; extern const u32 gMonBackPic_SawsbuckAutumn[]; extern const u32 gMonBackPic_SawsbuckWinter[]; @@ -2674,7 +2674,7 @@ extern const u32 gMonBackPic_GrimmsnarlGigantamax[]; extern const u32 gMonBackPic_AlcremieGigantamax[]; extern const u32 gMonBackPic_CopperajahGigantamax[]; extern const u32 gMonBackPic_DuraludonGigantamax[]; -extern const u32 gMonBackPic_UrshifuGigantamax[]; +extern const u32 gMonBackPic_UrshifuSingleStrikeGigantamax[]; extern const u32 gMonBackPic_UrshifuRapidStrikeGigantamax[]; #endif @@ -3030,7 +3030,7 @@ extern const u32 gMonPalette_Anorith[]; extern const u32 gMonPalette_Armaldo[]; extern const u32 gMonPalette_Feebas[]; extern const u32 gMonPalette_Milotic[]; -extern const u32 gMonPalette_Castform[]; +extern const u32 gMonPalette_CastformNormal[]; extern const u32 gMonPalette_Kecleon[]; extern const u32 gMonPalette_Shuppet[]; extern const u32 gMonPalette_Banette[]; @@ -3065,7 +3065,7 @@ extern const u32 gMonPalette_Kyogre[]; extern const u32 gMonPalette_Groudon[]; extern const u32 gMonPalette_Rayquaza[]; extern const u32 gMonPalette_Jirachi[]; -extern const u32 gMonPalette_Deoxys[]; +extern const u32 gMonPalette_DeoxysNormal[]; #if P_GEN_4_POKEMON == TRUE extern const u32 gMonPalette_Turtwig[]; extern const u32 gMonPalette_Grotle[]; @@ -3092,8 +3092,8 @@ extern const u32 gMonPalette_Cranidos[]; extern const u32 gMonPalette_Rampardos[]; extern const u32 gMonPalette_Shieldon[]; extern const u32 gMonPalette_Bastiodon[]; -extern const u32 gMonPalette_Burmy[]; -extern const u32 gMonPalette_Wormadam[]; +extern const u32 gMonPalette_BurmyPlantCloak[]; +extern const u32 gMonPalette_WormadamPlantCloak[]; extern const u32 gMonPalette_Mothim[]; extern const u32 gMonPalette_Combee[]; extern const u32 gMonPalette_CombeeF[]; @@ -3102,9 +3102,9 @@ extern const u32 gMonPalette_Pachirisu[]; extern const u32 gMonPalette_Buizel[]; extern const u32 gMonPalette_Floatzel[]; extern const u32 gMonPalette_Cherubi[]; -extern const u32 gMonPalette_Cherrim[]; -extern const u32 gMonPalette_Shellos[]; -extern const u32 gMonPalette_Gastrodon[]; +extern const u32 gMonPalette_CherrimOvercast[]; +extern const u32 gMonPalette_ShellosWestSea[]; +extern const u32 gMonPalette_GastrodonWestSea[]; extern const u32 gMonPalette_Ambipom[]; extern const u32 gMonPalette_Drifloon[]; extern const u32 gMonPalette_Drifblim[]; @@ -3170,12 +3170,12 @@ extern const u32 gMonPalette_Dialga[]; extern const u32 gMonPalette_Palkia[]; extern const u32 gMonPalette_Heatran[]; extern const u32 gMonPalette_Regigigas[]; -extern const u32 gMonPalette_Giratina[]; +extern const u32 gMonPalette_GiratinaAltered[]; extern const u32 gMonPalette_Cresselia[]; extern const u32 gMonPalette_Phione[]; extern const u32 gMonPalette_Manaphy[]; extern const u32 gMonPalette_Darkrai[]; -extern const u32 gMonPalette_Shaymin[]; +extern const u32 gMonPalette_ShayminLand[]; extern const u32 gMonPalette_Arceus[]; #endif #if P_GEN_5_POKEMON == TRUE @@ -3236,12 +3236,12 @@ extern const u32 gMonPalette_Cottonee[]; extern const u32 gMonPalette_Whimsicott[]; extern const u32 gMonPalette_Petilil[]; extern const u32 gMonPalette_Lilligant[]; -extern const u32 gMonPalette_Basculin[]; +extern const u32 gMonPalette_BasculinRedStriped[]; extern const u32 gMonPalette_Sandile[]; extern const u32 gMonPalette_Krokorok[]; extern const u32 gMonPalette_Krookodile[]; extern const u32 gMonPalette_Darumaka[]; -extern const u32 gMonPalette_Darmanitan[]; +extern const u32 gMonPalette_DarmanitanStandardMode[]; extern const u32 gMonPalette_Maractus[]; extern const u32 gMonPalette_Dwebble[]; extern const u32 gMonPalette_Crustle[]; @@ -3271,8 +3271,8 @@ extern const u32 gMonPalette_Swanna[]; extern const u32 gMonPalette_Vanillite[]; extern const u32 gMonPalette_Vanillish[]; extern const u32 gMonPalette_Vanilluxe[]; -extern const u32 gMonPalette_Deerling[]; -extern const u32 gMonPalette_Sawsbuck[]; +extern const u32 gMonPalette_DeerlingSpring[]; +extern const u32 gMonPalette_SawsbuckSpring[]; extern const u32 gMonPalette_Emolga[]; extern const u32 gMonPalette_Karrablast[]; extern const u32 gMonPalette_Escavalier[]; @@ -3329,14 +3329,14 @@ extern const u32 gMonPalette_Volcarona[]; extern const u32 gMonPalette_Cobalion[]; extern const u32 gMonPalette_Terrakion[]; extern const u32 gMonPalette_Virizion[]; -extern const u32 gMonPalette_Tornadus[]; -extern const u32 gMonPalette_Thundurus[]; +extern const u32 gMonPalette_TornadusIncarnate[]; +extern const u32 gMonPalette_ThundurusIncarnate[]; extern const u32 gMonPalette_Reshiram[]; extern const u32 gMonPalette_Zekrom[]; -extern const u32 gMonPalette_Landorus[]; +extern const u32 gMonPalette_LandorusIncarnate[]; extern const u32 gMonPalette_Kyurem[]; -extern const u32 gMonPalette_Keldeo[]; -extern const u32 gMonPalette_Meloetta[]; +extern const u32 gMonPalette_KeldeoOrdinary[]; +extern const u32 gMonPalette_MeloettaAria[]; extern const u32 gMonPalette_Genesect[]; #endif #if P_GEN_6_POKEMON == TRUE @@ -3356,22 +3356,22 @@ extern const u32 gMonPalette_Fletchinder[]; extern const u32 gMonPalette_Talonflame[]; extern const u32 gMonPalette_Scatterbug[]; extern const u32 gMonPalette_Spewpa[]; -extern const u32 gMonPalette_Vivillon[]; +extern const u32 gMonPalette_VivillonIcySnow[]; extern const u32 gMonPalette_Litleo[]; extern const u32 gMonPalette_Pyroar[]; -extern const u32 gMonPalette_Flabebe[]; -extern const u32 gMonPalette_Floette[]; -extern const u32 gMonPalette_Florges[]; +extern const u32 gMonPalette_FlabebeRedFlower[]; +extern const u32 gMonPalette_FloetteRedFlower[]; +extern const u32 gMonPalette_FlorgesRedFlower[]; extern const u32 gMonPalette_Skiddo[]; extern const u32 gMonPalette_Gogoat[]; extern const u32 gMonPalette_Pancham[]; extern const u32 gMonPalette_Pangoro[]; -extern const u32 gMonPalette_Furfrou[]; +extern const u32 gMonPalette_FurfrouNatural[]; extern const u32 gMonPalette_Espurr[]; -extern const u32 gMonPalette_Meowstic[]; +extern const u32 gMonPalette_MeowsticMale[]; extern const u32 gMonPalette_Honedge[]; extern const u32 gMonPalette_Doublade[]; -extern const u32 gMonPalette_Aegislash[]; +extern const u32 gMonPalette_AegislashShield[]; extern const u32 gMonPalette_Spritzee[]; extern const u32 gMonPalette_Aromatisse[]; extern const u32 gMonPalette_Swirlix[]; @@ -3406,11 +3406,11 @@ extern const u32 gMonPalette_Bergmite[]; extern const u32 gMonPalette_Avalugg[]; extern const u32 gMonPalette_Noibat[]; extern const u32 gMonPalette_Noivern[]; -extern const u32 gMonPalette_Xerneas[]; +extern const u32 gMonPalette_XerneasNeutral[]; extern const u32 gMonPalette_Yveltal[]; -extern const u32 gMonPalette_Zygarde[]; +extern const u32 gMonPalette_Zygarde50[]; extern const u32 gMonPalette_Diancie[]; -extern const u32 gMonPalette_Hoopa[]; +extern const u32 gMonPalette_HoopaConfined[]; extern const u32 gMonPalette_Volcanion[]; #endif #if P_GEN_7_POKEMON == TRUE @@ -3433,12 +3433,12 @@ extern const u32 gMonPalette_Charjabug[]; extern const u32 gMonPalette_Vikavolt[]; extern const u32 gMonPalette_Crabrawler[]; extern const u32 gMonPalette_Crabominable[]; -extern const u32 gMonPalette_Oricorio[]; +extern const u32 gMonPalette_OricorioBaile[]; extern const u32 gMonPalette_Cutiefly[]; extern const u32 gMonPalette_Ribombee[]; extern const u32 gMonPalette_Rockruff[]; -extern const u32 gMonPalette_Lycanroc[]; -extern const u32 gMonPalette_Wishiwashi[]; +extern const u32 gMonPalette_LycanrocMidday[]; +extern const u32 gMonPalette_WishiwashiSolo[]; extern const u32 gMonPalette_Mareanie[]; extern const u32 gMonPalette_Toxapex[]; extern const u32 gMonPalette_Mudbray[]; @@ -3465,12 +3465,12 @@ extern const u32 gMonPalette_Sandygast[]; extern const u32 gMonPalette_Palossand[]; extern const u32 gMonPalette_Pyukumuku[]; extern const u32 gMonPalette_TypeNull[]; -extern const u32 gMonPalette_Silvally[]; -extern const u32 gMonPalette_Minior[]; +extern const u32 gMonPalette_SilvallyNormal[]; +extern const u32 gMonPalette_MiniorMeteor[]; extern const u32 gMonPalette_Komala[]; extern const u32 gMonPalette_Turtonator[]; extern const u32 gMonPalette_Togedemaru[]; -extern const u32 gMonPalette_Mimikyu[]; +extern const u32 gMonPalette_MimikyuDisguised[]; extern const u32 gMonPalette_Bruxish[]; extern const u32 gMonPalette_Drampa[]; extern const u32 gMonPalette_Dhelmise[]; @@ -3543,7 +3543,7 @@ extern const u32 gMonPalette_Cramorant[]; extern const u32 gMonPalette_Arrokuda[]; extern const u32 gMonPalette_Barraskewda[]; extern const u32 gMonPalette_Toxel[]; -extern const u32 gMonPalette_Toxtricity[]; +extern const u32 gMonPalette_ToxtricityAmped[]; extern const u32 gMonPalette_Sizzlipede[]; extern const u32 gMonPalette_Centiskorch[]; extern const u32 gMonPalette_Clobbopus[]; @@ -3569,9 +3569,9 @@ extern const u32 gMonPalette_Pincurchin[]; extern const u32 gMonPalette_Snom[]; extern const u32 gMonPalette_Frosmoth[]; extern const u32 gMonPalette_Stonjourner[]; -extern const u32 gMonPalette_Eiscue[]; -extern const u32 gMonPalette_Indeedee[]; -extern const u32 gMonPalette_Morpeko[]; +extern const u32 gMonPalette_EiscueIceFace[]; +extern const u32 gMonPalette_IndeedeeMale[]; +extern const u32 gMonPalette_MorpekoFullBelly[]; extern const u32 gMonPalette_Cufant[]; extern const u32 gMonPalette_Copperajah[]; extern const u32 gMonPalette_Dracozolt[]; @@ -3582,11 +3582,11 @@ extern const u32 gMonPalette_Duraludon[]; extern const u32 gMonPalette_Dreepy[]; extern const u32 gMonPalette_Drakloak[]; extern const u32 gMonPalette_Dragapult[]; -extern const u32 gMonPalette_Zacian[]; -extern const u32 gMonPalette_Zamazenta[]; +extern const u32 gMonPalette_ZacianHeroOfManyBattles[]; +extern const u32 gMonPalette_ZamazentaHeroOfManyBattles[]; extern const u32 gMonPalette_Eternatus[]; extern const u32 gMonPalette_Kubfu[]; -extern const u32 gMonPalette_Urshifu[]; +extern const u32 gMonPalette_UrshifuSingleStrikeStyle[]; extern const u32 gMonPalette_Zarude[]; extern const u32 gMonPalette_Regieleki[]; extern const u32 gMonPalette_Regidrago[]; @@ -3596,10 +3596,10 @@ 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_BasculegionMale[]; extern const u32 gMonPalette_Sneasler[]; extern const u32 gMonPalette_Overqwil[]; -extern const u32 gMonPalette_Enamorus[]; +extern const u32 gMonPalette_EnamorusIncarnate[]; #endif extern const u32 gMonPalette_VenusaurMega[]; extern const u32 gMonPalette_CharizardMegaX[]; @@ -3692,7 +3692,7 @@ extern const u32 gMonPalette_ZigzagoonGalarian[]; extern const u32 gMonPalette_LinooneGalarian[]; #if P_GEN_5_POKEMON == TRUE extern const u32 gMonPalette_DarumakaGalarian[]; -extern const u32 gMonPalette_DarmanitanGalarian[]; +extern const u32 gMonPalette_DarmanitanGalarianStandardMode[]; extern const u32 gMonPalette_YamaskGalarian[]; extern const u32 gMonPalette_StunfiskGalarian[]; #endif @@ -3778,7 +3778,7 @@ 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_DarmanitanGalarianZenMode[]; extern const u32 gMonPalette_DeerlingSummer[]; extern const u32 gMonPalette_DeerlingAutumn[]; extern const u32 gMonPalette_DeerlingWinter[]; @@ -3939,7 +3939,7 @@ extern const u32 gMonPalette_GrimmsnarlGigantamax[]; extern const u32 gMonPalette_AlcremieGigantamax[]; extern const u32 gMonPalette_CopperajahGigantamax[]; extern const u32 gMonPalette_DuraludonGigantamax[]; -extern const u32 gMonPalette_UrshifuGigantamax[]; +extern const u32 gMonPalette_UrshifuSingleStrikeGigantamax[]; extern const u32 gMonPalette_UrshifuRapidStrikeGigantamax[]; #endif extern const u32 gMonPalette_Egg[]; @@ -4296,7 +4296,7 @@ extern const u32 gMonShinyPalette_Anorith[]; extern const u32 gMonShinyPalette_Armaldo[]; extern const u32 gMonShinyPalette_Feebas[]; extern const u32 gMonShinyPalette_Milotic[]; -extern const u32 gMonShinyPalette_Castform[]; +extern const u32 gMonShinyPalette_CastformNormal[]; extern const u32 gMonShinyPalette_Kecleon[]; extern const u32 gMonShinyPalette_Shuppet[]; extern const u32 gMonShinyPalette_Banette[]; @@ -4331,7 +4331,7 @@ extern const u32 gMonShinyPalette_Kyogre[]; extern const u32 gMonShinyPalette_Groudon[]; extern const u32 gMonShinyPalette_Rayquaza[]; extern const u32 gMonShinyPalette_Jirachi[]; -extern const u32 gMonShinyPalette_Deoxys[]; +extern const u32 gMonShinyPalette_DeoxysNormal[]; #if P_GEN_4_POKEMON == TRUE extern const u32 gMonShinyPalette_Turtwig[]; extern const u32 gMonShinyPalette_Grotle[]; @@ -4358,8 +4358,8 @@ extern const u32 gMonShinyPalette_Cranidos[]; extern const u32 gMonShinyPalette_Rampardos[]; extern const u32 gMonShinyPalette_Shieldon[]; extern const u32 gMonShinyPalette_Bastiodon[]; -extern const u32 gMonShinyPalette_Burmy[]; -extern const u32 gMonShinyPalette_Wormadam[]; +extern const u32 gMonShinyPalette_BurmyPlantCloak[]; +extern const u32 gMonShinyPalette_WormadamPlantCloak[]; extern const u32 gMonShinyPalette_Mothim[]; extern const u32 gMonShinyPalette_Combee[]; extern const u32 gMonShinyPalette_CombeeF[]; @@ -4368,9 +4368,9 @@ extern const u32 gMonShinyPalette_Pachirisu[]; extern const u32 gMonShinyPalette_Buizel[]; extern const u32 gMonShinyPalette_Floatzel[]; extern const u32 gMonShinyPalette_Cherubi[]; -extern const u32 gMonShinyPalette_Cherrim[]; -extern const u32 gMonShinyPalette_Shellos[]; -extern const u32 gMonShinyPalette_Gastrodon[]; +extern const u32 gMonShinyPalette_CherrimOvercast[]; +extern const u32 gMonShinyPalette_ShellosWestSea[]; +extern const u32 gMonShinyPalette_GastrodonWestSea[]; extern const u32 gMonShinyPalette_Ambipom[]; extern const u32 gMonShinyPalette_Drifloon[]; extern const u32 gMonShinyPalette_Drifblim[]; @@ -4436,12 +4436,12 @@ extern const u32 gMonShinyPalette_Dialga[]; extern const u32 gMonShinyPalette_Palkia[]; extern const u32 gMonShinyPalette_Heatran[]; extern const u32 gMonShinyPalette_Regigigas[]; -extern const u32 gMonShinyPalette_Giratina[]; +extern const u32 gMonShinyPalette_GiratinaAltered[]; extern const u32 gMonShinyPalette_Cresselia[]; extern const u32 gMonShinyPalette_Phione[]; extern const u32 gMonShinyPalette_Manaphy[]; extern const u32 gMonShinyPalette_Darkrai[]; -extern const u32 gMonShinyPalette_Shaymin[]; +extern const u32 gMonShinyPalette_ShayminLand[]; extern const u32 gMonShinyPalette_Arceus[]; #endif #if P_GEN_5_POKEMON == TRUE @@ -4502,12 +4502,12 @@ extern const u32 gMonShinyPalette_Cottonee[]; extern const u32 gMonShinyPalette_Whimsicott[]; extern const u32 gMonShinyPalette_Petilil[]; extern const u32 gMonShinyPalette_Lilligant[]; -extern const u32 gMonShinyPalette_Basculin[]; +extern const u32 gMonShinyPalette_BasculinRedStriped[]; extern const u32 gMonShinyPalette_Sandile[]; extern const u32 gMonShinyPalette_Krokorok[]; extern const u32 gMonShinyPalette_Krookodile[]; extern const u32 gMonShinyPalette_Darumaka[]; -extern const u32 gMonShinyPalette_Darmanitan[]; +extern const u32 gMonShinyPalette_DarmanitanStandardMode[]; extern const u32 gMonShinyPalette_Maractus[]; extern const u32 gMonShinyPalette_Dwebble[]; extern const u32 gMonShinyPalette_Crustle[]; @@ -4537,8 +4537,8 @@ extern const u32 gMonShinyPalette_Swanna[]; extern const u32 gMonShinyPalette_Vanillite[]; extern const u32 gMonShinyPalette_Vanillish[]; extern const u32 gMonShinyPalette_Vanilluxe[]; -extern const u32 gMonShinyPalette_Deerling[]; -extern const u32 gMonShinyPalette_Sawsbuck[]; +extern const u32 gMonShinyPalette_DeerlingSpring[]; +extern const u32 gMonShinyPalette_SawsbuckSpring[]; extern const u32 gMonShinyPalette_Emolga[]; extern const u32 gMonShinyPalette_Karrablast[]; extern const u32 gMonShinyPalette_Escavalier[]; @@ -4595,14 +4595,14 @@ extern const u32 gMonShinyPalette_Volcarona[]; extern const u32 gMonShinyPalette_Cobalion[]; extern const u32 gMonShinyPalette_Terrakion[]; extern const u32 gMonShinyPalette_Virizion[]; -extern const u32 gMonShinyPalette_Tornadus[]; -extern const u32 gMonShinyPalette_Thundurus[]; +extern const u32 gMonShinyPalette_TornadusIncarnate[]; +extern const u32 gMonShinyPalette_ThundurusIncarnate[]; extern const u32 gMonShinyPalette_Reshiram[]; extern const u32 gMonShinyPalette_Zekrom[]; -extern const u32 gMonShinyPalette_Landorus[]; +extern const u32 gMonShinyPalette_LandorusIncarnate[]; extern const u32 gMonShinyPalette_Kyurem[]; -extern const u32 gMonShinyPalette_Keldeo[]; -extern const u32 gMonShinyPalette_Meloetta[]; +extern const u32 gMonShinyPalette_KeldeoOrdinary[]; +extern const u32 gMonShinyPalette_MeloettaAria[]; extern const u32 gMonShinyPalette_Genesect[]; #endif #if P_GEN_6_POKEMON == TRUE @@ -4622,22 +4622,22 @@ extern const u32 gMonShinyPalette_Fletchinder[]; extern const u32 gMonShinyPalette_Talonflame[]; extern const u32 gMonShinyPalette_Scatterbug[]; extern const u32 gMonShinyPalette_Spewpa[]; -extern const u32 gMonShinyPalette_Vivillon[]; +extern const u32 gMonShinyPalette_VivillonIcySnow[]; extern const u32 gMonShinyPalette_Litleo[]; extern const u32 gMonShinyPalette_Pyroar[]; -extern const u32 gMonShinyPalette_Flabebe[]; -extern const u32 gMonShinyPalette_Floette[]; -extern const u32 gMonShinyPalette_Florges[]; +extern const u32 gMonShinyPalette_FlabebeRedFlower[]; +extern const u32 gMonShinyPalette_FloetteRedFlower[]; +extern const u32 gMonShinyPalette_FlorgesRedFlower[]; extern const u32 gMonShinyPalette_Skiddo[]; extern const u32 gMonShinyPalette_Gogoat[]; extern const u32 gMonShinyPalette_Pancham[]; extern const u32 gMonShinyPalette_Pangoro[]; -extern const u32 gMonShinyPalette_Furfrou[]; +extern const u32 gMonShinyPalette_FurfrouNatural[]; extern const u32 gMonShinyPalette_Espurr[]; -extern const u32 gMonShinyPalette_Meowstic[]; +extern const u32 gMonShinyPalette_MeowsticMale[]; extern const u32 gMonShinyPalette_Honedge[]; extern const u32 gMonShinyPalette_Doublade[]; -extern const u32 gMonShinyPalette_Aegislash[]; +extern const u32 gMonShinyPalette_AegislashShield[]; extern const u32 gMonShinyPalette_Spritzee[]; extern const u32 gMonShinyPalette_Aromatisse[]; extern const u32 gMonShinyPalette_Swirlix[]; @@ -4672,11 +4672,11 @@ extern const u32 gMonShinyPalette_Bergmite[]; extern const u32 gMonShinyPalette_Avalugg[]; extern const u32 gMonShinyPalette_Noibat[]; extern const u32 gMonShinyPalette_Noivern[]; -extern const u32 gMonShinyPalette_Xerneas[]; +extern const u32 gMonShinyPalette_XerneasNeutral[]; extern const u32 gMonShinyPalette_Yveltal[]; -extern const u32 gMonShinyPalette_Zygarde[]; +extern const u32 gMonShinyPalette_Zygarde50[]; extern const u32 gMonShinyPalette_Diancie[]; -extern const u32 gMonShinyPalette_Hoopa[]; +extern const u32 gMonShinyPalette_HoopaConfined[]; extern const u32 gMonShinyPalette_Volcanion[]; #endif #if P_GEN_7_POKEMON == TRUE @@ -4699,12 +4699,12 @@ extern const u32 gMonShinyPalette_Charjabug[]; extern const u32 gMonShinyPalette_Vikavolt[]; extern const u32 gMonShinyPalette_Crabrawler[]; extern const u32 gMonShinyPalette_Crabominable[]; -extern const u32 gMonShinyPalette_Oricorio[]; +extern const u32 gMonShinyPalette_OricorioBaile[]; extern const u32 gMonShinyPalette_Cutiefly[]; extern const u32 gMonShinyPalette_Ribombee[]; extern const u32 gMonShinyPalette_Rockruff[]; -extern const u32 gMonShinyPalette_Lycanroc[]; -extern const u32 gMonShinyPalette_Wishiwashi[]; +extern const u32 gMonShinyPalette_LycanrocMidday[]; +extern const u32 gMonShinyPalette_WishiwashiSolo[]; extern const u32 gMonShinyPalette_Mareanie[]; extern const u32 gMonShinyPalette_Toxapex[]; extern const u32 gMonShinyPalette_Mudbray[]; @@ -4731,12 +4731,12 @@ extern const u32 gMonShinyPalette_Sandygast[]; extern const u32 gMonShinyPalette_Palossand[]; extern const u32 gMonShinyPalette_Pyukumuku[]; extern const u32 gMonShinyPalette_TypeNull[]; -extern const u32 gMonShinyPalette_Silvally[]; -extern const u32 gMonShinyPalette_Minior[]; +extern const u32 gMonShinyPalette_SilvallyNormal[]; +extern const u32 gMonShinyPalette_MiniorMeteor[]; extern const u32 gMonShinyPalette_Komala[]; extern const u32 gMonShinyPalette_Turtonator[]; extern const u32 gMonShinyPalette_Togedemaru[]; -extern const u32 gMonShinyPalette_Mimikyu[]; +extern const u32 gMonShinyPalette_MimikyuDisguised[]; extern const u32 gMonShinyPalette_Bruxish[]; extern const u32 gMonShinyPalette_Drampa[]; extern const u32 gMonShinyPalette_Dhelmise[]; @@ -4809,7 +4809,7 @@ extern const u32 gMonShinyPalette_Cramorant[]; extern const u32 gMonShinyPalette_Arrokuda[]; extern const u32 gMonShinyPalette_Barraskewda[]; extern const u32 gMonShinyPalette_Toxel[]; -extern const u32 gMonShinyPalette_Toxtricity[]; +extern const u32 gMonShinyPalette_ToxtricityAmped[]; extern const u32 gMonShinyPalette_Sizzlipede[]; extern const u32 gMonShinyPalette_Centiskorch[]; extern const u32 gMonShinyPalette_Clobbopus[]; @@ -4835,9 +4835,9 @@ extern const u32 gMonShinyPalette_Pincurchin[]; extern const u32 gMonShinyPalette_Snom[]; extern const u32 gMonShinyPalette_Frosmoth[]; extern const u32 gMonShinyPalette_Stonjourner[]; -extern const u32 gMonShinyPalette_Eiscue[]; -extern const u32 gMonShinyPalette_Indeedee[]; -extern const u32 gMonShinyPalette_Morpeko[]; +extern const u32 gMonShinyPalette_EiscueIceFace[]; +extern const u32 gMonShinyPalette_IndeedeeMale[]; +extern const u32 gMonShinyPalette_MorpekoFullBelly[]; extern const u32 gMonShinyPalette_Cufant[]; extern const u32 gMonShinyPalette_Copperajah[]; extern const u32 gMonShinyPalette_Dracozolt[]; @@ -4848,11 +4848,11 @@ extern const u32 gMonShinyPalette_Duraludon[]; extern const u32 gMonShinyPalette_Dreepy[]; extern const u32 gMonShinyPalette_Drakloak[]; extern const u32 gMonShinyPalette_Dragapult[]; -extern const u32 gMonShinyPalette_Zacian[]; -extern const u32 gMonShinyPalette_Zamazenta[]; +extern const u32 gMonShinyPalette_ZacianHeroOfManyBattles[]; +extern const u32 gMonShinyPalette_ZamazentaHeroOfManyBattles[]; extern const u32 gMonShinyPalette_Eternatus[]; extern const u32 gMonShinyPalette_Kubfu[]; -extern const u32 gMonShinyPalette_Urshifu[]; +extern const u32 gMonShinyPalette_UrshifuSingleStrikeStyle[]; extern const u32 gMonShinyPalette_Zarude[]; extern const u32 gMonShinyPalette_Regieleki[]; extern const u32 gMonShinyPalette_Regidrago[]; @@ -4862,10 +4862,10 @@ 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_BasculegionMale[]; extern const u32 gMonShinyPalette_Sneasler[]; extern const u32 gMonShinyPalette_Overqwil[]; -extern const u32 gMonShinyPalette_Enamorus[]; +extern const u32 gMonShinyPalette_EnamorusIncarnate[]; #endif extern const u32 gMonShinyPalette_VenusaurMega[]; extern const u32 gMonShinyPalette_CharizardMegaX[]; @@ -4958,7 +4958,7 @@ extern const u32 gMonShinyPalette_ZigzagoonGalarian[]; extern const u32 gMonShinyPalette_LinooneGalarian[]; #if P_GEN_5_POKEMON == TRUE extern const u32 gMonShinyPalette_DarumakaGalarian[]; -extern const u32 gMonShinyPalette_DarmanitanGalarian[]; +extern const u32 gMonShinyPalette_DarmanitanGalarianStandardMode[]; extern const u32 gMonShinyPalette_YamaskGalarian[]; extern const u32 gMonShinyPalette_StunfiskGalarian[]; #endif @@ -5044,7 +5044,7 @@ 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_DarmanitanGalarianZenMode[]; extern const u32 gMonShinyPalette_DeerlingSummer[]; extern const u32 gMonShinyPalette_DeerlingAutumn[]; extern const u32 gMonShinyPalette_DeerlingWinter[]; @@ -5199,7 +5199,7 @@ extern const u32 gMonShinyPalette_GrimmsnarlGigantamax[]; extern const u32 gMonShinyPalette_AlcremieGigantamax[]; extern const u32 gMonShinyPalette_CopperajahGigantamax[]; extern const u32 gMonShinyPalette_DuraludonGigantamax[]; -extern const u32 gMonShinyPalette_UrshifuGigantamax[]; +extern const u32 gMonShinyPalette_UrshifuSingleStrikeGigantamax[]; extern const u32 gMonShinyPalette_UrshifuRapidStrikeGigantamax[]; #endif @@ -5554,7 +5554,7 @@ extern const u8 gMonIcon_Anorith[]; extern const u8 gMonIcon_Armaldo[]; extern const u8 gMonIcon_Feebas[]; extern const u8 gMonIcon_Milotic[]; -extern const u8 gMonIcon_Castform[]; +extern const u8 gMonIcon_CastformNormal[]; extern const u8 gMonIcon_Kecleon[]; extern const u8 gMonIcon_Shuppet[]; extern const u8 gMonIcon_Banette[]; @@ -5589,7 +5589,7 @@ extern const u8 gMonIcon_Kyogre[]; extern const u8 gMonIcon_Groudon[]; extern const u8 gMonIcon_Rayquaza[]; extern const u8 gMonIcon_Jirachi[]; -extern const u8 gMonIcon_Deoxys[]; +extern const u8 gMonIcon_DeoxysNormal[]; #if P_GEN_4_POKEMON == TRUE extern const u8 gMonIcon_Turtwig[]; extern const u8 gMonIcon_Grotle[]; @@ -5616,8 +5616,8 @@ extern const u8 gMonIcon_Cranidos[]; extern const u8 gMonIcon_Rampardos[]; extern const u8 gMonIcon_Shieldon[]; extern const u8 gMonIcon_Bastiodon[]; -extern const u8 gMonIcon_Burmy[]; -extern const u8 gMonIcon_Wormadam[]; +extern const u8 gMonIcon_BurmyPlantCloak[]; +extern const u8 gMonIcon_WormadamPlantCloak[]; extern const u8 gMonIcon_Mothim[]; extern const u8 gMonIcon_Combee[]; extern const u8 gMonIcon_Vespiquen[]; @@ -5625,9 +5625,9 @@ extern const u8 gMonIcon_Pachirisu[]; extern const u8 gMonIcon_Buizel[]; extern const u8 gMonIcon_Floatzel[]; extern const u8 gMonIcon_Cherubi[]; -extern const u8 gMonIcon_Cherrim[]; -extern const u8 gMonIcon_Shellos[]; -extern const u8 gMonIcon_Gastrodon[]; +extern const u8 gMonIcon_CherrimOvercast[]; +extern const u8 gMonIcon_ShellosWestSea[]; +extern const u8 gMonIcon_GastrodonWestSea[]; extern const u8 gMonIcon_Ambipom[]; extern const u8 gMonIcon_Drifloon[]; extern const u8 gMonIcon_Drifblim[]; @@ -5695,12 +5695,12 @@ extern const u8 gMonIcon_Dialga[]; extern const u8 gMonIcon_Palkia[]; extern const u8 gMonIcon_Heatran[]; extern const u8 gMonIcon_Regigigas[]; -extern const u8 gMonIcon_Giratina[]; +extern const u8 gMonIcon_GiratinaAltered[]; extern const u8 gMonIcon_Cresselia[]; extern const u8 gMonIcon_Phione[]; extern const u8 gMonIcon_Manaphy[]; extern const u8 gMonIcon_Darkrai[]; -extern const u8 gMonIcon_Shaymin[]; +extern const u8 gMonIcon_ShayminLand[]; extern const u8 gMonIcon_Arceus[]; #endif #if P_GEN_5_POKEMON == TRUE @@ -5761,12 +5761,12 @@ extern const u8 gMonIcon_Cottonee[]; extern const u8 gMonIcon_Whimsicott[]; extern const u8 gMonIcon_Petilil[]; extern const u8 gMonIcon_Lilligant[]; -extern const u8 gMonIcon_Basculin[]; +extern const u8 gMonIcon_BasculinRedStriped[]; extern const u8 gMonIcon_Sandile[]; extern const u8 gMonIcon_Krokorok[]; extern const u8 gMonIcon_Krookodile[]; extern const u8 gMonIcon_Darumaka[]; -extern const u8 gMonIcon_Darmanitan[]; +extern const u8 gMonIcon_DarmanitanStandardMode[]; extern const u8 gMonIcon_Maractus[]; extern const u8 gMonIcon_Dwebble[]; extern const u8 gMonIcon_Crustle[]; @@ -5796,8 +5796,8 @@ extern const u8 gMonIcon_Swanna[]; extern const u8 gMonIcon_Vanillite[]; extern const u8 gMonIcon_Vanillish[]; extern const u8 gMonIcon_Vanilluxe[]; -extern const u8 gMonIcon_Deerling[]; -extern const u8 gMonIcon_Sawsbuck[]; +extern const u8 gMonIcon_DeerlingSpring[]; +extern const u8 gMonIcon_SawsbuckSpring[]; extern const u8 gMonIcon_Emolga[]; extern const u8 gMonIcon_Karrablast[]; extern const u8 gMonIcon_Escavalier[]; @@ -5854,14 +5854,14 @@ extern const u8 gMonIcon_Volcarona[]; extern const u8 gMonIcon_Cobalion[]; extern const u8 gMonIcon_Terrakion[]; extern const u8 gMonIcon_Virizion[]; -extern const u8 gMonIcon_Tornadus[]; -extern const u8 gMonIcon_Thundurus[]; +extern const u8 gMonIcon_TornadusIncarnate[]; +extern const u8 gMonIcon_ThundurusIncarnate[]; extern const u8 gMonIcon_Reshiram[]; extern const u8 gMonIcon_Zekrom[]; -extern const u8 gMonIcon_Landorus[]; +extern const u8 gMonIcon_LandorusIncarnate[]; extern const u8 gMonIcon_Kyurem[]; -extern const u8 gMonIcon_Keldeo[]; -extern const u8 gMonIcon_Meloetta[]; +extern const u8 gMonIcon_KeldeoOrdinary[]; +extern const u8 gMonIcon_MeloettaAria[]; extern const u8 gMonIcon_Genesect[]; #endif #if P_GEN_6_POKEMON == TRUE @@ -5881,23 +5881,23 @@ extern const u8 gMonIcon_Fletchinder[]; extern const u8 gMonIcon_Talonflame[]; extern const u8 gMonIcon_Scatterbug[]; extern const u8 gMonIcon_Spewpa[]; -extern const u8 gMonIcon_Vivillon[]; +extern const u8 gMonIcon_VivillonIcySnow[]; extern const u8 gMonIcon_Litleo[]; extern const u8 gMonIcon_Pyroar[]; extern const u8 gMonIcon_PyroarF[]; -extern const u8 gMonIcon_Flabebe[]; -extern const u8 gMonIcon_Floette[]; -extern const u8 gMonIcon_Florges[]; +extern const u8 gMonIcon_FlabebeRedFlower[]; +extern const u8 gMonIcon_FloetteRedFlower[]; +extern const u8 gMonIcon_FlorgesRedFlower[]; extern const u8 gMonIcon_Skiddo[]; extern const u8 gMonIcon_Gogoat[]; extern const u8 gMonIcon_Pancham[]; extern const u8 gMonIcon_Pangoro[]; -extern const u8 gMonIcon_Furfrou[]; +extern const u8 gMonIcon_FurfrouNatural[]; extern const u8 gMonIcon_Espurr[]; -extern const u8 gMonIcon_Meowstic[]; +extern const u8 gMonIcon_MeowsticMale[]; extern const u8 gMonIcon_Honedge[]; extern const u8 gMonIcon_Doublade[]; -extern const u8 gMonIcon_Aegislash[]; +extern const u8 gMonIcon_AegislashShield[]; extern const u8 gMonIcon_Spritzee[]; extern const u8 gMonIcon_Aromatisse[]; extern const u8 gMonIcon_Swirlix[]; @@ -5932,11 +5932,11 @@ extern const u8 gMonIcon_Bergmite[]; extern const u8 gMonIcon_Avalugg[]; extern const u8 gMonIcon_Noibat[]; extern const u8 gMonIcon_Noivern[]; -extern const u8 gMonIcon_Xerneas[]; +extern const u8 gMonIcon_XerneasNeutral[]; extern const u8 gMonIcon_Yveltal[]; -extern const u8 gMonIcon_Zygarde[]; +extern const u8 gMonIcon_Zygarde50[]; extern const u8 gMonIcon_Diancie[]; -extern const u8 gMonIcon_Hoopa[]; +extern const u8 gMonIcon_HoopaConfined[]; extern const u8 gMonIcon_Volcanion[]; #endif #if P_GEN_7_POKEMON == TRUE @@ -5959,12 +5959,12 @@ extern const u8 gMonIcon_Charjabug[]; extern const u8 gMonIcon_Vikavolt[]; extern const u8 gMonIcon_Crabrawler[]; extern const u8 gMonIcon_Crabominable[]; -extern const u8 gMonIcon_Oricorio[]; +extern const u8 gMonIcon_OricorioBaile[]; extern const u8 gMonIcon_Cutiefly[]; extern const u8 gMonIcon_Ribombee[]; extern const u8 gMonIcon_Rockruff[]; -extern const u8 gMonIcon_Lycanroc[]; -extern const u8 gMonIcon_Wishiwashi[]; +extern const u8 gMonIcon_LycanrocMidday[]; +extern const u8 gMonIcon_WishiwashiSolo[]; extern const u8 gMonIcon_Mareanie[]; extern const u8 gMonIcon_Toxapex[]; extern const u8 gMonIcon_Mudbray[]; @@ -5992,11 +5992,11 @@ extern const u8 gMonIcon_Palossand[]; extern const u8 gMonIcon_Pyukumuku[]; extern const u8 gMonIcon_TypeNull[]; extern const u8 gMonIcon_Silvally[]; -extern const u8 gMonIcon_Minior[]; +extern const u8 gMonIcon_MiniorMeteor[]; extern const u8 gMonIcon_Komala[]; extern const u8 gMonIcon_Turtonator[]; extern const u8 gMonIcon_Togedemaru[]; -extern const u8 gMonIcon_Mimikyu[]; +extern const u8 gMonIcon_MimikyuDisguised[]; extern const u8 gMonIcon_Bruxish[]; extern const u8 gMonIcon_Drampa[]; extern const u8 gMonIcon_Dhelmise[]; @@ -6069,7 +6069,7 @@ extern const u8 gMonIcon_Cramorant[]; extern const u8 gMonIcon_Arrokuda[]; extern const u8 gMonIcon_Barraskewda[]; extern const u8 gMonIcon_Toxel[]; -extern const u8 gMonIcon_Toxtricity[]; +extern const u8 gMonIcon_ToxtricityAmped[]; extern const u8 gMonIcon_Sizzlipede[]; extern const u8 gMonIcon_Centiskorch[]; extern const u8 gMonIcon_Clobbopus[]; @@ -6095,9 +6095,9 @@ extern const u8 gMonIcon_Pincurchin[]; extern const u8 gMonIcon_Snom[]; extern const u8 gMonIcon_Frosmoth[]; extern const u8 gMonIcon_Stonjourner[]; -extern const u8 gMonIcon_Eiscue[]; -extern const u8 gMonIcon_Indeedee[]; -extern const u8 gMonIcon_Morpeko[]; +extern const u8 gMonIcon_EiscueIceFace[]; +extern const u8 gMonIcon_IndeedeeMale[]; +extern const u8 gMonIcon_MorpekoFullBelly[]; extern const u8 gMonIcon_Cufant[]; extern const u8 gMonIcon_Copperajah[]; extern const u8 gMonIcon_Dracozolt[]; @@ -6108,11 +6108,11 @@ extern const u8 gMonIcon_Duraludon[]; extern const u8 gMonIcon_Dreepy[]; extern const u8 gMonIcon_Drakloak[]; extern const u8 gMonIcon_Dragapult[]; -extern const u8 gMonIcon_Zacian[]; -extern const u8 gMonIcon_Zamazenta[]; +extern const u8 gMonIcon_ZacianHeroOfManyBattles[]; +extern const u8 gMonIcon_ZamazentaHeroOfManyBattles[]; extern const u8 gMonIcon_Eternatus[]; extern const u8 gMonIcon_Kubfu[]; -extern const u8 gMonIcon_Urshifu[]; +extern const u8 gMonIcon_UrshifuSingleStrikeStyle[]; extern const u8 gMonIcon_Zarude[]; extern const u8 gMonIcon_Regieleki[]; extern const u8 gMonIcon_Regidrago[]; @@ -6122,10 +6122,10 @@ 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_BasculegionMale[]; extern const u8 gMonIcon_Sneasler[]; extern const u8 gMonIcon_Overqwil[]; -extern const u8 gMonIcon_Enamorus[]; +extern const u8 gMonIcon_EnamorusIncarnate[]; #endif extern const u8 gMonIcon_VenusaurMega[]; extern const u8 gMonIcon_CharizardMegaX[]; @@ -6218,7 +6218,7 @@ extern const u8 gMonIcon_ZigzagoonGalarian[]; extern const u8 gMonIcon_LinooneGalarian[]; #if P_GEN_5_POKEMON == TRUE extern const u8 gMonIcon_DarumakaGalarian[]; -extern const u8 gMonIcon_DarmanitanGalarian[]; +extern const u8 gMonIcon_DarmanitanGalarianStandardMode[]; extern const u8 gMonIcon_YamaskGalarian[]; extern const u8 gMonIcon_StunfiskGalarian[]; #endif @@ -6314,7 +6314,7 @@ 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_DarmanitanGalarianZenMode[]; extern const u8 gMonIcon_DeerlingSummer[]; extern const u8 gMonIcon_DeerlingAutumn[]; extern const u8 gMonIcon_DeerlingWinter[]; @@ -6403,14 +6403,14 @@ extern const u8 gMonIcon_MagearnaOriginalColor[]; extern const u8 gMonIcon_CramorantGulping[]; extern const u8 gMonIcon_CramorantGorging[]; extern const u8 gMonIcon_ToxtricityLowKey[]; -//extern const u8 gMonIcon_AlcremieRubyCream[]; -//extern const u8 gMonIcon_AlcremieMatchaCream[]; -//extern const u8 gMonIcon_AlcremieMintCream[]; -//extern const u8 gMonIcon_AlcremieLemonCream[]; -//extern const u8 gMonIcon_AlcremieSaltedCream[]; -//extern const u8 gMonIcon_AlcremieRubySwirl[]; -//extern const u8 gMonIcon_AlcremieCaramelSwirl[]; -//extern const u8 gMonIcon_AlcremieRainbowSwirl[]; +//extern const u8 gMonIcon_AlcremieStrawberryRubyCream[]; +//extern const u8 gMonIcon_AlcremieStrawberryMatchaCream[]; +//extern const u8 gMonIcon_AlcremieStrawberryMintCream[]; +//extern const u8 gMonIcon_AlcremieStrawberryLemonCream[]; +//extern const u8 gMonIcon_AlcremieStrawberrySaltedCream[]; +//extern const u8 gMonIcon_AlcremieStrawberryRubySwirl[]; +//extern const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[]; +//extern const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[]; extern const u8 gMonIcon_EiscueNoiceFace[]; extern const u8 gMonIcon_IndeedeeFemale[]; extern const u8 gMonIcon_MorpekoHangry[]; @@ -6453,7 +6453,7 @@ extern const u8 gMonIcon_GrimmsnarlGigantamax[]; extern const u8 gMonIcon_AlcremieGigantamax[]; extern const u8 gMonIcon_CopperajahGigantamax[]; extern const u8 gMonIcon_DuraludonGigantamax[]; -extern const u8 gMonIcon_UrshifuGigantamax[]; +extern const u8 gMonIcon_UrshifuSingleStrikeGigantamax[]; extern const u8 gMonIcon_UrshifuRapidStrikeGigantamax[]; #endif extern const u8 gMonIcon_Egg[]; @@ -7404,7 +7404,7 @@ extern const u32 gMonFrontPic_GrimmsnarlGigantamax[]; extern const u32 gMonFrontPic_AlcremieGigantamax[]; extern const u32 gMonFrontPic_CopperajahGigantamax[]; extern const u32 gMonFrontPic_DuraludonGigantamax[]; -extern const u32 gMonFrontPic_UrshifuGigantamax[]; +extern const u32 gMonFrontPic_UrshifuSingleStrikeGigantamax[]; extern const u32 gMonFrontPic_UrshifuRapidStrikeGigantamax[]; #endif diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index e8453ae1e0..03a41733aa 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -4693,7 +4693,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score case EFFECT_RELIC_SONG: if (!(gBattleMons[battlerAtk].status2 & STATUS2_TRANSFORMED)) // Don't try to change form if it's transformed. { - if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA && gBattleMons[battlerDef].defense < gBattleMons[battlerDef].spDefense) + if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA_ARIA && gBattleMons[battlerDef].defense < gBattleMons[battlerDef].spDefense) ADJUST_SCORE(3); // Change to Pirouette if can do more damage else if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA_PIROUETTE && gBattleMons[battlerDef].spDefense < gBattleMons[battlerDef].defense) ADJUST_SCORE(3); // Change to Aria if can do more damage diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 8c584c8509..faffe0e6b3 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -3897,9 +3897,9 @@ bool32 ShouldUseZMove(u32 battlerAtk, u32 battlerDef, u32 chosenMove) { u8 effectiveness; - if (gBattleMons[battlerDef].ability == ABILITY_DISGUISE && gBattleMons[battlerDef].species == SPECIES_MIMIKYU) + if (gBattleMons[battlerDef].ability == ABILITY_DISGUISE && gBattleMons[battlerDef].species == SPECIES_MIMIKYU_DISGUISED) return FALSE; // Don't waste a Z-Move busting disguise - if (gBattleMons[battlerDef].ability == ABILITY_ICE_FACE && gBattleMons[battlerDef].species == SPECIES_EISCUE && IS_MOVE_PHYSICAL(chosenMove)) + if (gBattleMons[battlerDef].ability == ABILITY_ICE_FACE && gBattleMons[battlerDef].species == SPECIES_EISCUE_ICE_FACE && IS_MOVE_PHYSICAL(chosenMove)) return FALSE; // Don't waste a Z-Move busting Ice Face if (IS_MOVE_STATUS(chosenMove) && !IS_MOVE_STATUS(gBattleStruct->zmove.chosenZMove)) diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index c29c9d28e0..a9370a4ab5 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -88,7 +88,7 @@ static const struct GMaxMove sGMaxMoveTable[] = {SPECIES_ALCREMIE_GIGANTAMAX, TYPE_FAIRY, MOVE_G_MAX_FINALE}, {SPECIES_COPPERAJAH_GIGANTAMAX, TYPE_STEEL, MOVE_G_MAX_STEELSURGE}, {SPECIES_DURALUDON_GIGANTAMAX, TYPE_DRAGON, MOVE_G_MAX_DEPLETION}, - {SPECIES_URSHIFU_GIGANTAMAX, TYPE_DARK, MOVE_G_MAX_ONE_BLOW}, + {SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX,TYPE_DARK, MOVE_G_MAX_ONE_BLOW}, {SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, TYPE_WATER, MOVE_G_MAX_RAPID_FLOW}, }; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 3dc177635f..610d6284b5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1225,7 +1225,7 @@ static bool32 TryAegiFormChange(void) { default: return FALSE; - case SPECIES_AEGISLASH: // Shield -> Blade + case SPECIES_AEGISLASH_SHIELD: // Shield -> Blade if (IS_MOVE_STATUS(gCurrentMove)) return FALSE; gBattleMons[gBattlerAttacker].species = SPECIES_AEGISLASH_BLADE; @@ -1233,7 +1233,7 @@ static bool32 TryAegiFormChange(void) case SPECIES_AEGISLASH_BLADE: // Blade -> Shield if (gCurrentMove != MOVE_KINGS_SHIELD) return FALSE; - gBattleMons[gBattlerAttacker].species = SPECIES_AEGISLASH; + gBattleMons[gBattlerAttacker].species = SPECIES_AEGISLASH_SHIELD; break; } @@ -3551,14 +3551,14 @@ void SetMoveEffect(bool32 primary, u32 certain) case MOVE_EFFECT_RELIC_SONG: if (GetBattlerAbility(gBattlerAttacker) != ABILITY_SHEER_FORCE && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED)) { - if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA) + if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA_ARIA) { gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA_PIROUETTE; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeMoveEffect); } else if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA_PIROUETTE) { - gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA; + gBattleMons[gBattlerAttacker].species = SPECIES_MELOETTA_ARIA; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeMoveEffect); } } @@ -9401,7 +9401,8 @@ static void Cmd_various(void) case VARIOUS_TRY_REFLECT_TYPE: { VARIOUS_ARGS(const u8 *failInstr); - if (gBattleMons[gBattlerTarget].species == SPECIES_ARCEUS || gBattleMons[gBattlerTarget].species == SPECIES_SILVALLY) + if (GET_BASE_SPECIES_ID(gBattleMons[gBattlerTarget].species) == SPECIES_ARCEUS + || GET_BASE_SPECIES_ID(gBattleMons[gBattlerTarget].species) == SPECIES_SILVALLY) { gBattlescriptCurrInstr = cmd->failInstr; } @@ -14677,7 +14678,7 @@ bool32 DoesSubstituteBlockMove(u32 battlerAtk, u32 battlerDef, u32 move) bool32 DoesDisguiseBlockMove(u32 battlerAtk, u32 battlerDef, u32 move) { - if (gBattleMons[battlerDef].species != SPECIES_MIMIKYU + if (gBattleMons[battlerDef].species != SPECIES_MIMIKYU_DISGUISED || gBattleMons[battlerDef].status2 & STATUS2_TRANSFORMED || IS_MOVE_STATUS(move) || gHitMarker & HITMARKER_IGNORE_DISGUISE diff --git a/src/battle_setup.c b/src/battle_setup.c index 1c598c8f82..e8ffcd8908 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -590,15 +590,21 @@ void BattleSetup_StartLegendaryBattle(void) { default: case SPECIES_GROUDON: + case SPECIES_GROUDON_PRIMAL: CreateBattleStartTask(B_TRANSITION_GROUDON, MUS_VS_KYOGRE_GROUDON); break; case SPECIES_KYOGRE: + case SPECIES_KYOGRE_PRIMAL: CreateBattleStartTask(B_TRANSITION_KYOGRE, MUS_VS_KYOGRE_GROUDON); break; case SPECIES_RAYQUAZA: + case SPECIES_RAYQUAZA_MEGA: CreateBattleStartTask(B_TRANSITION_RAYQUAZA, MUS_VS_RAYQUAZA); break; - case SPECIES_DEOXYS: + case SPECIES_DEOXYS_NORMAL: + case SPECIES_DEOXYS_ATTACK: + case SPECIES_DEOXYS_DEFENSE: + case SPECIES_DEOXYS_SPEED: CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEOXYS); break; case SPECIES_LUGIA: diff --git a/src/battle_util.c b/src/battle_util.c index fb58181fbb..da143514f1 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4928,7 +4928,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 gBattlescriptCurrInstr = BattleScript_GoodAsGoldActivates; effect = 1; } - else if (gLastUsedAbility == ABILITY_ICE_FACE && IS_MOVE_PHYSICAL(move) && gBattleMons[gBattlerTarget].species == SPECIES_EISCUE) + else if (gLastUsedAbility == ABILITY_ICE_FACE && IS_MOVE_PHYSICAL(move) && gBattleMons[gBattlerTarget].species == SPECIES_EISCUE_ICE_FACE) { gBattleMons[gBattlerTarget].species = SPECIES_EISCUE_NOICE_FACE; if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) @@ -5989,7 +5989,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 && gBattleStruct->allowedToChangeFormInWeather[gBattlerPartyIndexes[battler]][GetBattlerSide(battler)]) { gBattleStruct->allowedToChangeFormInWeather[gBattlerPartyIndexes[battler]][GetBattlerSide(battler)] = FALSE; - gBattleMons[battler].species = SPECIES_EISCUE; + gBattleMons[battler].species = SPECIES_EISCUE_ICE_FACE; BattleScriptPushCursorAndCallback(BattleScript_BattlerFormChangeWithStringEnd3); effect++; } @@ -7988,12 +7988,7 @@ u32 GetMoveTarget(u16 move, u8 setTarget) static bool32 IsBattlerModernFatefulEncounter(u32 battler) { - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) - return TRUE; - if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS - && GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES, NULL) != SPECIES_MEW) - return TRUE; - return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_MODERN_FATEFUL_ENCOUNTER, NULL); + return TRUE; } u8 IsMonDisobedient(void) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 6c89420403..7069d17386 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -70,12 +70,11 @@ static const struct SignatureZMove sSignatureZMoves[] = {SPECIES_KOMMO_O, ITEM_KOMMONIUM_Z, MOVE_CLANGING_SCALES, MOVE_CLANGOROUS_SOULBLAZE}, {SPECIES_LUNALA, ITEM_LUNALIUM_Z, MOVE_MOONGEIST_BEAM, MOVE_MENACING_MOONRAZE_MAELSTROM}, {SPECIES_NECROZMA_DAWN_WINGS, ITEM_LUNALIUM_Z, MOVE_MOONGEIST_BEAM, MOVE_MENACING_MOONRAZE_MAELSTROM}, - {SPECIES_LYCANROC, ITEM_LYCANIUM_Z, MOVE_STONE_EDGE, MOVE_SPLINTERED_STORMSHARDS}, + {SPECIES_LYCANROC_MIDDAY, ITEM_LYCANIUM_Z, MOVE_STONE_EDGE, MOVE_SPLINTERED_STORMSHARDS}, {SPECIES_LYCANROC_MIDNIGHT, ITEM_LYCANIUM_Z, MOVE_STONE_EDGE, MOVE_SPLINTERED_STORMSHARDS}, - {SPECIES_LYCANROC_DUSK, ITEM_LYCANIUM_Z, MOVE_STONE_EDGE, MOVE_SPLINTERED_STORMSHARDS}, {SPECIES_MARSHADOW, ITEM_MARSHADIUM_Z, MOVE_SPECTRAL_THIEF, MOVE_SOUL_STEALING_7_STAR_STRIKE}, - {SPECIES_MIMIKYU, ITEM_MIMIKIUM_Z, MOVE_PLAY_ROUGH, MOVE_LETS_SNUGGLE_FOREVER}, + {SPECIES_MIMIKYU_DISGUISED, ITEM_MIMIKIUM_Z, MOVE_PLAY_ROUGH, MOVE_LETS_SNUGGLE_FOREVER}, {SPECIES_MIMIKYU_BUSTED, ITEM_MIMIKIUM_Z, MOVE_PLAY_ROUGH, MOVE_LETS_SNUGGLE_FOREVER}, {SPECIES_PIKACHU_ORIGINAL_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, {SPECIES_PIKACHU_HOENN_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h index 7d378da6f1..a2ca35aa7d 100644 --- a/src/data/bard_music/pokemon.h +++ b/src/data/bard_music/pokemon.h @@ -2884,7 +2884,7 @@ const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = { NULL_BARD_SOUND, NULL_BARD_SOUND, }, - [SPECIES_CASTFORM] = { + [SPECIES_CASTFORM_NORMAL] = { { .songLengthId = 0 }, { .songLengthId = 26 }, { .songLengthId = 51 }, @@ -3084,7 +3084,7 @@ const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = { NULL_BARD_SOUND, NULL_BARD_SOUND, }, - [SPECIES_DEOXYS] = { + [SPECIES_DEOXYS_NORMAL] = { { .songLengthId = 12 }, { .songLengthId = 27 }, { .songLengthId = 17 }, diff --git a/src/data/battle_frontier/battle_frontier_mons.h b/src/data/battle_frontier/battle_frontier_mons.h index df0a7d9b27..1147ab9080 100644 --- a/src/data/battle_frontier/battle_frontier_mons.h +++ b/src/data/battle_frontier/battle_frontier_mons.h @@ -1429,7 +1429,7 @@ const struct FacilityMon gBattleFrontierMons[NUM_FRONTIER_MONS] = .nature = NATURE_ADAMANT }, [FRONTIER_MON_CASTFORM_1] = { - .species = SPECIES_CASTFORM, + .species = SPECIES_CASTFORM_NORMAL, .moves = {MOVE_EMBER, MOVE_WATER_PULSE, MOVE_SHOCK_WAVE, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, @@ -2164,7 +2164,7 @@ const struct FacilityMon gBattleFrontierMons[NUM_FRONTIER_MONS] = .nature = NATURE_JOLLY }, [FRONTIER_MON_CASTFORM_2] = { - .species = SPECIES_CASTFORM, + .species = SPECIES_CASTFORM_NORMAL, .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_WATER_PULSE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h index feeb29524f..d3f02d33ab 100644 --- a/src/data/contest_opponents.h +++ b/src/data/contest_opponents.h @@ -1760,7 +1760,7 @@ const struct ContestPokemon gContestOpponents[] = .otId = CONTEST_AI_TRAINER_ID, }, [CONTEST_OPPONENT_FELICIA] = { - .species = SPECIES_CASTFORM, + .species = SPECIES_CASTFORM_NORMAL, .nickname = _("CASTER"), .trainerName = _("FELICIA"), .trainerGfxId = OBJ_EVENT_GFX_LASS, diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 3574e02446..cfb9700b76 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -411,7 +411,7 @@ const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_fro const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/anim_front.4bpp.lz"); const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz"); const u32 gMonFrontPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/anim_frontf.4bpp.lz"); -const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz"); +const u32 gMonFrontPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/anim_front.4bpp.lz"); const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/anim_front.4bpp.lz"); @@ -447,7 +447,7 @@ const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/anim_front const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz"); const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz"); +const u32 gMonFrontPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz"); #if P_GEN_4_POKEMON == TRUE const u32 gMonFrontPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/anim_front.4bpp.lz"); const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/anim_front.4bpp.lz"); @@ -485,8 +485,8 @@ const u32 gMonFrontPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/anim_f const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/anim_front.4bpp.lz"); const u32 gMonFrontPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz"); +const u32 gMonFrontPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4bpp.lz"); +const u32 gMonFrontPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz"); const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz"); const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz"); @@ -495,9 +495,9 @@ const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/pachirisu/ani const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz"); const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/normal/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Shellos[] = INCBIN_U32("graphics/pokemon/shellos/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Gastrodon[] = INCBIN_U32("graphics/pokemon/gastrodon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/anim_front.4bpp.lz"); const u32 gMonFrontPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/anim_front.4bpp.lz"); @@ -575,12 +575,12 @@ const u32 gMonFrontPic_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/anim_front const u32 gMonFrontPic_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/anim_front.4bpp.lz"); const u32 gMonFrontPic_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/anim_front.4bpp.lz"); const u32 gMonFrontPic_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Giratina[] = INCBIN_U32("graphics/pokemon/giratina/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/anim_front.4bpp.lz"); const u32 gMonFrontPic_Phione[] = INCBIN_U32("graphics/pokemon/phione/anim_front.4bpp.lz"); const u32 gMonFrontPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/anim_front.4bpp.lz"); const u32 gMonFrontPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/anim_front.4bpp.lz"); const u32 gMonFrontPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/anim_front.4bpp.lz"); #endif #if P_GEN_5_POKEMON == TRUE @@ -641,12 +641,12 @@ const u32 gMonFrontPic_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/anim_f const u32 gMonFrontPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/anim_front.4bpp.lz"); const u32 gMonFrontPic_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Basculin[] = INCBIN_U32("graphics/pokemon/basculin/anim_front.4bpp.lz"); +const u32 gMonFrontPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/anim_front.4bpp.lz"); const u32 gMonFrontPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/anim_front.4bpp.lz"); const u32 gMonFrontPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/anim_front.4bpp.lz"); const u32 gMonFrontPic_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Darmanitan[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front.4bpp.lz"); +const u32 gMonFrontPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front.4bpp.lz"); const u32 gMonFrontPic_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/anim_front.4bpp.lz"); const u32 gMonFrontPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/anim_front.4bpp.lz"); @@ -677,7 +677,7 @@ const u32 gMonFrontPic_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/anim const u32 gMonFrontPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/anim_front.4bpp.lz"); const u32 gMonFrontPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/anim_front.4bpp.lz"); const u32 gMonFrontPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Sawsbuck[] = INCBIN_U32("graphics/pokemon/sawsbuck/anim_front.4bpp.lz"); +const u32 gMonFrontPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/anim_front.4bpp.lz"); const u32 gMonFrontPic_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/anim_front.4bpp.lz"); const u32 gMonFrontPic_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/anim_front.4bpp.lz"); const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/anim_front.4bpp.lz"); @@ -734,14 +734,14 @@ const u32 gMonFrontPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/anim const u32 gMonFrontPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/anim_front.4bpp.lz"); const u32 gMonFrontPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/anim_front.4bpp.lz"); const u32 gMonFrontPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Tornadus[] = INCBIN_U32("graphics/pokemon/tornadus/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Thundurus[] = INCBIN_U32("graphics/pokemon/thundurus/anim_front.4bpp.lz"); +const u32 gMonFrontPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/anim_front.4bpp.lz"); const u32 gMonFrontPic_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Landorus[] = INCBIN_U32("graphics/pokemon/landorus/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/anim_front.4bpp.lz"); +const u32 gMonFrontPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/anim_front.4bpp.lz"); const u32 gMonFrontPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/anim_front.4bpp.lz"); #endif #if P_GEN_6_POKEMON == TRUE @@ -761,7 +761,7 @@ const u32 gMonFrontPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/ const u32 gMonFrontPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/anim_front.4bpp.lz"); const u32 gMonFrontPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/anim_front.4bpp.lz"); const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/anim_front.4bpp.lz"); const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/anim_frontf.4bpp.lz"); @@ -772,12 +772,12 @@ const u32 gMonFrontPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/anim_front const u32 gMonFrontPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/anim_front.4bpp.lz"); const u32 gMonFrontPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/anim_front.4bpp.lz"); const u32 gMonFrontPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/anim_front.4bpp.lz"); const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/anim_front.4bpp.lz"); +const u32 gMonFrontPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/anim_front.4bpp.lz"); const u32 gMonFrontPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/anim_front.4bpp.lz"); const u32 gMonFrontPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/anim_front.4bpp.lz"); const u32 gMonFrontPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/anim_front.4bpp.lz"); @@ -806,17 +806,17 @@ const u32 gMonFrontPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/anim_front const u32 gMonFrontPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/anim_front.4bpp.lz"); const u32 gMonFrontPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/anim_front.4bpp.lz"); const u32 gMonFrontPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/pumpkaboo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gourgeist/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/anim_front.4bpp.lz"); const u32 gMonFrontPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/anim_front.4bpp.lz"); const u32 gMonFrontPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/anim_front.4bpp.lz"); const u32 gMonFrontPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Xerneas[] = INCBIN_U32("graphics/pokemon/xerneas/front.4bpp.lz"); +const u32 gMonFrontPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/front.4bpp.lz"); const u32 gMonFrontPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/anim_front.4bpp.lz"); const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/anim_front.4bpp.lz"); +const u32 gMonFrontPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/anim_front.4bpp.lz"); const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/anim_front.4bpp.lz"); #endif #if P_GEN_7_POKEMON == TRUE @@ -839,12 +839,12 @@ const u32 gMonFrontPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/anim const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/anim_front.4bpp.lz"); const u32 gMonFrontPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/front.4bpp.lz"); const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/front.4bpp.lz"); -const u32 gMonFrontPic_Oricorio[] = INCBIN_U32("graphics/pokemon/oricorio/front.4bpp.lz"); +const u32 gMonFrontPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/front.4bpp.lz"); const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/front.4bpp.lz"); const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/front.4bpp.lz"); const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/front.4bpp.lz"); -const u32 gMonFrontPic_Lycanroc[] = INCBIN_U32("graphics/pokemon/lycanroc/front.4bpp.lz"); -const u32 gMonFrontPic_Wishiwashi[] = INCBIN_U32("graphics/pokemon/wishiwashi/front.4bpp.lz"); +const u32 gMonFrontPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/front.4bpp.lz"); +const u32 gMonFrontPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/front.4bpp.lz"); const u32 gMonFrontPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/front.4bpp.lz"); const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/front.4bpp.lz"); const u32 gMonFrontPic_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/front.4bpp.lz"); @@ -872,11 +872,11 @@ const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/fron const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/anim_front.4bpp.lz"); const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz"); const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz"); -const u32 gMonFrontPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz"); +const u32 gMonFrontPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz"); const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/front.4bpp.lz"); const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/anim_front.4bpp.lz"); const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/front.4bpp.lz"); -const u32 gMonFrontPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4bpp.lz"); +const u32 gMonFrontPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4bpp.lz"); const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz"); const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz"); const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz"); @@ -949,7 +949,7 @@ const u32 gMonFrontPic_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/fron const u32 gMonFrontPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/front.4bpp.lz"); const u32 gMonFrontPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/front.4bpp.lz"); const u32 gMonFrontPic_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/front.4bpp.lz"); -const u32 gMonFrontPic_Toxtricity[] = INCBIN_U32("graphics/pokemon/toxtricity/front.4bpp.lz"); +const u32 gMonFrontPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/front.4bpp.lz"); const u32 gMonFrontPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/anim_front.4bpp.lz"); const u32 gMonFrontPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/anim_front.4bpp.lz"); const u32 gMonFrontPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/front.4bpp.lz"); @@ -975,9 +975,9 @@ const u32 gMonFrontPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/an const u32 gMonFrontPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/front.4bpp.lz"); const u32 gMonFrontPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/front.4bpp.lz"); const u32 gMonFrontPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/front.4bpp.lz"); -const u32 gMonFrontPic_Eiscue[] = INCBIN_U32("graphics/pokemon/eiscue/front.4bpp.lz"); -const u32 gMonFrontPic_Indeedee[] = INCBIN_U32("graphics/pokemon/indeedee/front.4bpp.lz"); -const u32 gMonFrontPic_Morpeko[] = INCBIN_U32("graphics/pokemon/morpeko/front.4bpp.lz"); +const u32 gMonFrontPic_EiscueFace[] = INCBIN_U32("graphics/pokemon/eiscue/front.4bpp.lz"); +const u32 gMonFrontPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/front.4bpp.lz"); +const u32 gMonFrontPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/front.4bpp.lz"); const u32 gMonFrontPic_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/front.4bpp.lz"); const u32 gMonFrontPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/front.4bpp.lz"); const u32 gMonFrontPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/front.4bpp.lz"); @@ -988,11 +988,11 @@ const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/fron const u32 gMonFrontPic_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/front.4bpp.lz"); const u32 gMonFrontPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/front.4bpp.lz"); const u32 gMonFrontPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/front.4bpp.lz"); -const u32 gMonFrontPic_Zacian[] = INCBIN_U32("graphics/pokemon/zacian/front.4bpp.lz"); -const u32 gMonFrontPic_Zamazenta[] = INCBIN_U32("graphics/pokemon/zamazenta/front.4bpp.lz"); +const u32 gMonFrontPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/front.4bpp.lz"); +const u32 gMonFrontPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/front.4bpp.lz"); const u32 gMonFrontPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/front.4bpp.lz"); const u32 gMonFrontPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/front.4bpp.lz"); -const u32 gMonFrontPic_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz"); +const u32 gMonFrontPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz"); const u32 gMonFrontPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/front.4bpp.lz"); const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/front.4bpp.lz"); const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/front.4bpp.lz"); @@ -1002,10 +1002,10 @@ const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4b 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_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/front.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_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz"); #endif const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/front.4bpp.lz"); const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz"); @@ -1098,7 +1098,7 @@ const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzag const u32 gMonFrontPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/front.4bpp.lz"); #if P_GEN_5_POKEMON == TRUE const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/front.4bpp.lz"); -const u32 gMonFrontPic_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/front.4bpp.lz"); +const u32 gMonFrontPic_DarmanitanGalarianStandardMode[] = 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"); #endif @@ -1195,7 +1195,7 @@ const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/a 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_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/front.4bpp.lz"); const u32 gMonFrontPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/front.4bpp.lz"); const u32 gMonFrontPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/front.4bpp.lz"); const u32 gMonFrontPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/front.4bpp.lz"); @@ -1320,7 +1320,7 @@ const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gri const u32 gMonFrontPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/front.4bpp.lz"); const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/front.4bpp.lz"); const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/front.4bpp.lz"); -const u32 gMonFrontPic_UrshifuGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/front.4bpp.lz"); +const u32 gMonFrontPic_UrshifuSingleStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/front.4bpp.lz"); const u32 gMonFrontPic_UrshifuRapidStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.4bpp.lz"); #endif const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); @@ -1734,7 +1734,7 @@ const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/back.4bpp const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/back.4bpp.lz"); const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/back.4bpp.lz"); const u32 gMonBackPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/backf.4bpp.lz"); -const u32 gMonBackPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.lz"); +const u32 gMonBackPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.lz"); const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/back.4bpp.lz"); const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/back.4bpp.lz"); const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/back.4bpp.lz"); @@ -1770,7 +1770,7 @@ const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/back.4bpp.l const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp.lz"); const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz"); const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz"); -const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz"); +const u32 gMonBackPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz"); #if P_GEN_4_POKEMON == TRUE const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/back.4bpp.lz"); const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/back.4bpp.lz"); @@ -1806,8 +1806,8 @@ const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/back.4b const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/back.4bpp.lz"); const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/back.4bpp.lz"); const u32 gMonBackPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/back.4bpp.lz"); -const u32 gMonBackPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz"); -const u32 gMonBackPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz"); +const u32 gMonBackPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz"); +const u32 gMonBackPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz"); const u32 gMonBackPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/back.4bpp.lz"); const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/back.4bpp.lz"); const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/back.4bpp.lz"); @@ -1817,9 +1817,9 @@ const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/buizel/backf.4bpp const u32 gMonBackPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/back.4bpp.lz"); const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/floatzel/backf.4bpp.lz"); const u32 gMonBackPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/back.4bpp.lz"); -const u32 gMonBackPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/normal/back.4bpp.lz"); -const u32 gMonBackPic_Shellos[] = INCBIN_U32("graphics/pokemon/shellos/back.4bpp.lz"); -const u32 gMonBackPic_Gastrodon[] = INCBIN_U32("graphics/pokemon/gastrodon/back.4bpp.lz"); +const u32 gMonBackPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/back.4bpp.lz"); +const u32 gMonBackPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/back.4bpp.lz"); +const u32 gMonBackPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/back.4bpp.lz"); const u32 gMonBackPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/back.4bpp.lz"); const u32 gMonBackPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/backf.4bpp.lz"); const u32 gMonBackPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/back.4bpp.lz"); @@ -1893,12 +1893,12 @@ const u32 gMonBackPic_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/back.4bpp.l const u32 gMonBackPic_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/back.4bpp.lz"); const u32 gMonBackPic_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/back.4bpp.lz"); const u32 gMonBackPic_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/back.4bpp.lz"); -const u32 gMonBackPic_Giratina[] = INCBIN_U32("graphics/pokemon/giratina/back.4bpp.lz"); +const u32 gMonBackPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/back.4bpp.lz"); const u32 gMonBackPic_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/back.4bpp.lz"); const u32 gMonBackPic_Phione[] = INCBIN_U32("graphics/pokemon/phione/back.4bpp.lz"); const u32 gMonBackPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/back.4bpp.lz"); const u32 gMonBackPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/back.4bpp.lz"); -const u32 gMonBackPic_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/back.4bpp.lz"); +const u32 gMonBackPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/back.4bpp.lz"); const u32 gMonBackPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/back.4bpp.lz"); #endif #if P_GEN_5_POKEMON == TRUE @@ -1959,12 +1959,12 @@ const u32 gMonBackPic_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/back.4b const u32 gMonBackPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/back.4bpp.lz"); const u32 gMonBackPic_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/back.4bpp.lz"); const u32 gMonBackPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/back.4bpp.lz"); -const u32 gMonBackPic_Basculin[] = INCBIN_U32("graphics/pokemon/basculin/back.4bpp.lz"); +const u32 gMonBackPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/back.4bpp.lz"); const u32 gMonBackPic_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/back.4bpp.lz"); const u32 gMonBackPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/back.4bpp.lz"); const u32 gMonBackPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/back.4bpp.lz"); const u32 gMonBackPic_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/back.4bpp.lz"); -const u32 gMonBackPic_Darmanitan[] = INCBIN_U32("graphics/pokemon/darmanitan/back.4bpp.lz"); +const u32 gMonBackPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/back.4bpp.lz"); const u32 gMonBackPic_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/back.4bpp.lz"); const u32 gMonBackPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/back.4bpp.lz"); const u32 gMonBackPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/back.4bpp.lz"); @@ -1995,7 +1995,7 @@ const u32 gMonBackPic_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/back. const u32 gMonBackPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/back.4bpp.lz"); const u32 gMonBackPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/back.4bpp.lz"); const u32 gMonBackPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/back.4bpp.lz"); -const u32 gMonBackPic_Sawsbuck[] = INCBIN_U32("graphics/pokemon/sawsbuck/back.4bpp.lz"); +const u32 gMonBackPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/back.4bpp.lz"); const u32 gMonBackPic_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/back.4bpp.lz"); const u32 gMonBackPic_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/back.4bpp.lz"); const u32 gMonBackPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/back.4bpp.lz"); @@ -2052,14 +2052,14 @@ const u32 gMonBackPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/back. const u32 gMonBackPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/back.4bpp.lz"); const u32 gMonBackPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/back.4bpp.lz"); const u32 gMonBackPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/back.4bpp.lz"); -const u32 gMonBackPic_Tornadus[] = INCBIN_U32("graphics/pokemon/tornadus/back.4bpp.lz"); -const u32 gMonBackPic_Thundurus[] = INCBIN_U32("graphics/pokemon/thundurus/back.4bpp.lz"); +const u32 gMonBackPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/back.4bpp.lz"); +const u32 gMonBackPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/back.4bpp.lz"); const u32 gMonBackPic_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/back.4bpp.lz"); const u32 gMonBackPic_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/back.4bpp.lz"); -const u32 gMonBackPic_Landorus[] = INCBIN_U32("graphics/pokemon/landorus/back.4bpp.lz"); +const u32 gMonBackPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/back.4bpp.lz"); const u32 gMonBackPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/back.4bpp.lz"); -const u32 gMonBackPic_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/back.4bpp.lz"); -const u32 gMonBackPic_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/back.4bpp.lz"); +const u32 gMonBackPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/back.4bpp.lz"); +const u32 gMonBackPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/back.4bpp.lz"); const u32 gMonBackPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/back.4bpp.lz"); #endif #if P_GEN_6_POKEMON == TRUE @@ -2079,7 +2079,7 @@ const u32 gMonBackPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/b const u32 gMonBackPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/back.4bpp.lz"); const u32 gMonBackPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/back.4bpp.lz"); const u32 gMonBackPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/back.4bpp.lz"); -const u32 gMonBackPic_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/back.4bpp.lz"); +const u32 gMonBackPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/back.4bpp.lz"); const u32 gMonBackPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/back.4bpp.lz"); const u32 gMonBackPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/back.4bpp.lz"); const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/backf.4bpp.lz"); @@ -2090,12 +2090,12 @@ const u32 gMonBackPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/back.4bpp.l const u32 gMonBackPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/back.4bpp.lz"); const u32 gMonBackPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/back.4bpp.lz"); const u32 gMonBackPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/back.4bpp.lz"); -const u32 gMonBackPic_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/back.4bpp.lz"); +const u32 gMonBackPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/back.4bpp.lz"); const u32 gMonBackPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/back.4bpp.lz"); -const u32 gMonBackPic_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/back.4bpp.lz"); +const u32 gMonBackPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/back.4bpp.lz"); const u32 gMonBackPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/back.4bpp.lz"); const u32 gMonBackPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/back.4bpp.lz"); -const u32 gMonBackPic_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/back.4bpp.lz"); +const u32 gMonBackPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/back.4bpp.lz"); const u32 gMonBackPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/back.4bpp.lz"); const u32 gMonBackPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/back.4bpp.lz"); const u32 gMonBackPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/back.4bpp.lz"); @@ -2124,17 +2124,17 @@ const u32 gMonBackPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/back.4bpp.l const u32 gMonBackPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/back.4bpp.lz"); const u32 gMonBackPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/back.4bpp.lz"); const u32 gMonBackPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/back.4bpp.lz"); -const u32 gMonBackPic_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/back.4bpp.lz"); -const u32 gMonBackPic_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/back.4bpp.lz"); +const u32 gMonBackPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/pumpkaboo/back.4bpp.lz"); +const u32 gMonBackPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gourgeist/back.4bpp.lz"); const u32 gMonBackPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/back.4bpp.lz"); const u32 gMonBackPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/back.4bpp.lz"); const u32 gMonBackPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/back.4bpp.lz"); const u32 gMonBackPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/back.4bpp.lz"); -const u32 gMonBackPic_Xerneas[] = INCBIN_U32("graphics/pokemon/xerneas/back.4bpp.lz"); +const u32 gMonBackPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/back.4bpp.lz"); const u32 gMonBackPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/back.4bpp.lz"); -const u32 gMonBackPic_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/back.4bpp.lz"); +const u32 gMonBackPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/back.4bpp.lz"); const u32 gMonBackPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/back.4bpp.lz"); -const u32 gMonBackPic_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/back.4bpp.lz"); +const u32 gMonBackPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/back.4bpp.lz"); const u32 gMonBackPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/back.4bpp.lz"); #endif #if P_GEN_7_POKEMON == TRUE @@ -2157,12 +2157,12 @@ const u32 gMonBackPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/back. const u32 gMonBackPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/back.4bpp.lz"); const u32 gMonBackPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/back.4bpp.lz"); const u32 gMonBackPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/back.4bpp.lz"); -const u32 gMonBackPic_Oricorio[] = INCBIN_U32("graphics/pokemon/oricorio/back.4bpp.lz"); +const u32 gMonBackPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/back.4bpp.lz"); const u32 gMonBackPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/back.4bpp.lz"); const u32 gMonBackPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/back.4bpp.lz"); const u32 gMonBackPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/back.4bpp.lz"); -const u32 gMonBackPic_Lycanroc[] = INCBIN_U32("graphics/pokemon/lycanroc/back.4bpp.lz"); -const u32 gMonBackPic_Wishiwashi[] = INCBIN_U32("graphics/pokemon/wishiwashi/back.4bpp.lz"); +const u32 gMonBackPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/back.4bpp.lz"); +const u32 gMonBackPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/back.4bpp.lz"); const u32 gMonBackPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/back.4bpp.lz"); const u32 gMonBackPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/back.4bpp.lz"); const u32 gMonBackPic_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/back.4bpp.lz"); @@ -2190,11 +2190,11 @@ const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/back. const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/back.4bpp.lz"); const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz"); const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/back.4bpp.lz"); -const u32 gMonBackPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/back.4bpp.lz"); +const u32 gMonBackPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/back.4bpp.lz"); const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/back.4bpp.lz"); const u32 gMonBackPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/back.4bpp.lz"); const u32 gMonBackPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/back.4bpp.lz"); -const u32 gMonBackPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp.lz"); +const u32 gMonBackPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp.lz"); const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp.lz"); const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz"); const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz"); @@ -2267,7 +2267,7 @@ const u32 gMonBackPic_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/back. const u32 gMonBackPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/back.4bpp.lz"); const u32 gMonBackPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/back.4bpp.lz"); const u32 gMonBackPic_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/back.4bpp.lz"); -const u32 gMonBackPic_Toxtricity[] = INCBIN_U32("graphics/pokemon/toxtricity/back.4bpp.lz"); +const u32 gMonBackPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/back.4bpp.lz"); const u32 gMonBackPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/back.4bpp.lz"); const u32 gMonBackPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/back.4bpp.lz"); const u32 gMonBackPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/back.4bpp.lz"); @@ -2293,9 +2293,9 @@ const u32 gMonBackPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/bac const u32 gMonBackPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/back.4bpp.lz"); const u32 gMonBackPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/back.4bpp.lz"); const u32 gMonBackPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/back.4bpp.lz"); -const u32 gMonBackPic_Eiscue[] = INCBIN_U32("graphics/pokemon/eiscue/back.4bpp.lz"); -const u32 gMonBackPic_Indeedee[] = INCBIN_U32("graphics/pokemon/indeedee/back.4bpp.lz"); -const u32 gMonBackPic_Morpeko[] = INCBIN_U32("graphics/pokemon/morpeko/back.4bpp.lz"); +const u32 gMonBackPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/back.4bpp.lz"); +const u32 gMonBackPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/back.4bpp.lz"); +const u32 gMonBackPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/back.4bpp.lz"); const u32 gMonBackPic_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/back.4bpp.lz"); const u32 gMonBackPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/back.4bpp.lz"); const u32 gMonBackPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/back.4bpp.lz"); @@ -2306,11 +2306,11 @@ const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/back. const u32 gMonBackPic_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/back.4bpp.lz"); const u32 gMonBackPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/back.4bpp.lz"); const u32 gMonBackPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/back.4bpp.lz"); -const u32 gMonBackPic_Zacian[] = INCBIN_U32("graphics/pokemon/zacian/back.4bpp.lz"); -const u32 gMonBackPic_Zamazenta[] = INCBIN_U32("graphics/pokemon/zamazenta/back.4bpp.lz"); +const u32 gMonBackPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/back.4bpp.lz"); +const u32 gMonBackPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/back.4bpp.lz"); const u32 gMonBackPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/back.4bpp.lz"); const u32 gMonBackPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/back.4bpp.lz"); -const u32 gMonBackPic_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz"); +const u32 gMonBackPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz"); const u32 gMonBackPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/back.4bpp.lz"); const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/back.4bpp.lz"); const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.4bpp.lz"); @@ -2320,10 +2320,10 @@ const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp 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_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/back.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_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); #endif const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/back.4bpp.lz"); const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/back.4bpp.lz"); @@ -2416,7 +2416,7 @@ const u32 gMonBackPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzago const u32 gMonBackPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/back.4bpp.lz"); #if P_GEN_5_POKEMON == TRUE const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/back.4bpp.lz"); -const u32 gMonBackPic_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/back.4bpp.lz"); +const u32 gMonBackPic_DarmanitanGalarianStandardMode[] = 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"); #endif @@ -2513,7 +2513,7 @@ const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/ba 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_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/back.4bpp.lz"); const u32 gMonBackPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/back.4bpp.lz"); const u32 gMonBackPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/back.4bpp.lz"); const u32 gMonBackPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/back.4bpp.lz"); @@ -2638,7 +2638,7 @@ const u32 gMonBackPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grim const u32 gMonBackPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/back.4bpp.lz"); const u32 gMonBackPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/back.4bpp.lz"); const u32 gMonBackPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/back.4bpp.lz"); -const u32 gMonBackPic_UrshifuGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/back.4bpp.lz"); +const u32 gMonBackPic_UrshifuSingleStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/back.4bpp.lz"); const u32 gMonBackPic_UrshifuRapidStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.4bpp.lz"); #endif @@ -2994,7 +2994,7 @@ const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/normal.gb const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/normal.gbapal.lz"); const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/normal.gbapal.lz"); const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/normal.gbapal.lz"); -const u32 gMonPalette_Castform[] = INCBIN_U32("graphics/pokemon/castform/normal.gbapal.lz"); +const u32 gMonPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/normal.gbapal.lz"); const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/normal.gbapal.lz"); const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/normal.gbapal.lz"); const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/normal.gbapal.lz"); @@ -3029,7 +3029,7 @@ const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/normal.gbap const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/normal.gbapal.lz"); const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz"); const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/normal.gbapal.lz"); -const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz"); +const u32 gMonPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz"); #if P_GEN_4_POKEMON == TRUE const u32 gMonPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/normal.gbapal.lz"); const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/normal.gbapal.lz"); @@ -3056,8 +3056,8 @@ const u32 gMonPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/normal. const u32 gMonPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/normal.gbapal.lz"); const u32 gMonPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/normal.gbapal.lz"); const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/normal.gbapal.lz"); -const u32 gMonPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz"); -const u32 gMonPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz"); +const u32 gMonPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz"); +const u32 gMonPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz"); const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/normal.gbapal.lz"); const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/normal.gbapal.lz"); const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/normalf.gbapal.lz"); @@ -3066,9 +3066,9 @@ const u32 gMonPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/norma const u32 gMonPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/normal.gbapal.lz"); const u32 gMonPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/normal.gbapal.lz"); const u32 gMonPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/normal.gbapal.lz"); -const u32 gMonPalette_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/normal/normal.gbapal.lz"); -const u32 gMonPalette_Shellos[] = INCBIN_U32("graphics/pokemon/shellos/normal.gbapal.lz"); -const u32 gMonPalette_Gastrodon[] = INCBIN_U32("graphics/pokemon/gastrodon/normal.gbapal.lz"); +const u32 gMonPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/normal.gbapal.lz"); +const u32 gMonPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/normal.gbapal.lz"); +const u32 gMonPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/normal.gbapal.lz"); const u32 gMonPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/normal.gbapal.lz"); const u32 gMonPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/normal.gbapal.lz"); const u32 gMonPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/normal.gbapal.lz"); @@ -3134,12 +3134,12 @@ const u32 gMonPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/normal.gbap const u32 gMonPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/normal.gbapal.lz"); const u32 gMonPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/normal.gbapal.lz"); const u32 gMonPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/normal.gbapal.lz"); -const u32 gMonPalette_Giratina[] = INCBIN_U32("graphics/pokemon/giratina/normal.gbapal.lz"); +const u32 gMonPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/normal.gbapal.lz"); const u32 gMonPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/normal.gbapal.lz"); const u32 gMonPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/normal.gbapal.lz"); const u32 gMonPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/normal.gbapal.lz"); const u32 gMonPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/normal.gbapal.lz"); -const u32 gMonPalette_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/normal.gbapal.lz"); +const u32 gMonPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/normal.gbapal.lz"); const u32 gMonPalette_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/normal.gbapal.lz"); #endif #if P_GEN_5_POKEMON == TRUE @@ -3200,12 +3200,12 @@ const u32 gMonPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/normal. const u32 gMonPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/normal.gbapal.lz"); const u32 gMonPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/normal.gbapal.lz"); const u32 gMonPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/normal.gbapal.lz"); -const u32 gMonPalette_Basculin[] = INCBIN_U32("graphics/pokemon/basculin/normal.gbapal.lz"); +const u32 gMonPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/normal.gbapal.lz"); const u32 gMonPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/normal.gbapal.lz"); const u32 gMonPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/normal.gbapal.lz"); const u32 gMonPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/normal.gbapal.lz"); const u32 gMonPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/normal.gbapal.lz"); -const u32 gMonPalette_Darmanitan[] = INCBIN_U32("graphics/pokemon/darmanitan/normal.gbapal.lz"); +const u32 gMonPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/normal.gbapal.lz"); const u32 gMonPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/normal.gbapal.lz"); const u32 gMonPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/normal.gbapal.lz"); const u32 gMonPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/normal.gbapal.lz"); @@ -3235,8 +3235,8 @@ const u32 gMonPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/normal.gbap const u32 gMonPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/normal.gbapal.lz"); const u32 gMonPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/normal.gbapal.lz"); const u32 gMonPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/normal.gbapal.lz"); -const u32 gMonPalette_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/normal.gbapal.lz"); -const u32 gMonPalette_Sawsbuck[] = INCBIN_U32("graphics/pokemon/sawsbuck/normal.gbapal.lz"); +const u32 gMonPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/normal.gbapal.lz"); +const u32 gMonPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/normal.gbapal.lz"); const u32 gMonPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/normal.gbapal.lz"); const u32 gMonPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/normal.gbapal.lz"); const u32 gMonPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/normal.gbapal.lz"); @@ -3293,14 +3293,14 @@ const u32 gMonPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/norma const u32 gMonPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/normal.gbapal.lz"); const u32 gMonPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/normal.gbapal.lz"); const u32 gMonPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/normal.gbapal.lz"); -const u32 gMonPalette_Tornadus[] = INCBIN_U32("graphics/pokemon/tornadus/normal.gbapal.lz"); -const u32 gMonPalette_Thundurus[] = INCBIN_U32("graphics/pokemon/thundurus/normal.gbapal.lz"); +const u32 gMonPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/normal.gbapal.lz"); +const u32 gMonPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/normal.gbapal.lz"); const u32 gMonPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/normal.gbapal.lz"); const u32 gMonPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/normal.gbapal.lz"); -const u32 gMonPalette_Landorus[] = INCBIN_U32("graphics/pokemon/landorus/normal.gbapal.lz"); +const u32 gMonPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/normal.gbapal.lz"); const u32 gMonPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/normal.gbapal.lz"); -const u32 gMonPalette_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/normal.gbapal.lz"); -const u32 gMonPalette_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/normal.gbapal.lz"); +const u32 gMonPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/normal.gbapal.lz"); +const u32 gMonPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/normal.gbapal.lz"); const u32 gMonPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/normal.gbapal.lz"); #endif #if P_GEN_6_POKEMON == TRUE @@ -3320,22 +3320,22 @@ const u32 gMonPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/n const u32 gMonPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/normal.gbapal.lz"); const u32 gMonPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/normal.gbapal.lz"); const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/normal.gbapal.lz"); -const u32 gMonPalette_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/normal.gbapal.lz"); +const u32 gMonPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/normal.gbapal.lz"); const u32 gMonPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/normal.gbapal.lz"); const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/normal.gbapal.lz"); -const u32 gMonPalette_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz"); -const u32 gMonPalette_Floette[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz"); -const u32 gMonPalette_Florges[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz"); +const u32 gMonPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz"); +const u32 gMonPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz"); +const u32 gMonPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz"); const u32 gMonPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/normal.gbapal.lz"); const u32 gMonPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/normal.gbapal.lz"); const u32 gMonPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/normal.gbapal.lz"); const u32 gMonPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/normal.gbapal.lz"); -const u32 gMonPalette_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/normal.gbapal.lz"); +const u32 gMonPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/normal.gbapal.lz"); const u32 gMonPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/normal.gbapal.lz"); -const u32 gMonPalette_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/normal.gbapal.lz"); +const u32 gMonPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/normal.gbapal.lz"); const u32 gMonPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/normal.gbapal.lz"); const u32 gMonPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/normal.gbapal.lz"); -const u32 gMonPalette_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/normal.gbapal.lz"); +const u32 gMonPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/normal.gbapal.lz"); const u32 gMonPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/normal.gbapal.lz"); const u32 gMonPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/normal.gbapal.lz"); const u32 gMonPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/normal.gbapal.lz"); @@ -3370,11 +3370,11 @@ const u32 gMonPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/normal. const u32 gMonPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/normal.gbapal.lz"); const u32 gMonPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/normal.gbapal.lz"); const u32 gMonPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/normal.gbapal.lz"); -const u32 gMonPalette_Xerneas[] = INCBIN_U32("graphics/pokemon/xerneas/normal.gbapal.lz"); +const u32 gMonPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/normal.gbapal.lz"); const u32 gMonPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/normal.gbapal.lz"); -const u32 gMonPalette_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/normal.gbapal.lz"); +const u32 gMonPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/normal.gbapal.lz"); const u32 gMonPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/normal.gbapal.lz"); -const u32 gMonPalette_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/normal.gbapal.lz"); +const u32 gMonPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/normal.gbapal.lz"); const u32 gMonPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/normal.gbapal.lz"); #endif #if P_GEN_7_POKEMON == TRUE @@ -3397,12 +3397,12 @@ const u32 gMonPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/norma const u32 gMonPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/normal.gbapal.lz"); const u32 gMonPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/normal.gbapal.lz"); const u32 gMonPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/normal.gbapal.lz"); -const u32 gMonPalette_Oricorio[] = INCBIN_U32("graphics/pokemon/oricorio/normal.gbapal.lz"); +const u32 gMonPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/normal.gbapal.lz"); const u32 gMonPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/normal.gbapal.lz"); const u32 gMonPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/normal.gbapal.lz"); const u32 gMonPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/normal.gbapal.lz"); -const u32 gMonPalette_Lycanroc[] = INCBIN_U32("graphics/pokemon/lycanroc/normal.gbapal.lz"); -const u32 gMonPalette_Wishiwashi[] = INCBIN_U32("graphics/pokemon/wishiwashi/normal.gbapal.lz"); +const u32 gMonPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/normal.gbapal.lz"); +const u32 gMonPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/normal.gbapal.lz"); const u32 gMonPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/normal.gbapal.lz"); const u32 gMonPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/normal.gbapal.lz"); const u32 gMonPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/normal.gbapal.lz"); @@ -3429,12 +3429,12 @@ const u32 gMonPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/norma const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/normal.gbapal.lz"); const u32 gMonPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/normal.gbapal.lz"); const u32 gMonPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz"); -const u32 gMonPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz"); -const u32 gMonPalette_Minior[] = INCBIN_U32("graphics/pokemon/minior/normal.gbapal.lz"); +const u32 gMonPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz"); +const u32 gMonPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/normal.gbapal.lz"); const u32 gMonPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/normal.gbapal.lz"); const u32 gMonPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/normal.gbapal.lz"); const u32 gMonPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/normal.gbapal.lz"); -const u32 gMonPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/normal.gbapal.lz"); +const u32 gMonPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/normal.gbapal.lz"); const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/normal.gbapal.lz"); const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/normal.gbapal.lz"); const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal.gbapal.lz"); @@ -3507,7 +3507,7 @@ const u32 gMonPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/norma const u32 gMonPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/normal.gbapal.lz"); const u32 gMonPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/normal.gbapal.lz"); const u32 gMonPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/normal.gbapal.lz"); -const u32 gMonPalette_Toxtricity[] = INCBIN_U32("graphics/pokemon/toxtricity/normal.gbapal.lz"); +const u32 gMonPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/normal.gbapal.lz"); const u32 gMonPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/normal.gbapal.lz"); const u32 gMonPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/normal.gbapal.lz"); const u32 gMonPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/normal.gbapal.lz"); @@ -3533,9 +3533,9 @@ const u32 gMonPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/nor const u32 gMonPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/normal.gbapal.lz"); const u32 gMonPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/normal.gbapal.lz"); const u32 gMonPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/normal.gbapal.lz"); -const u32 gMonPalette_Eiscue[] = INCBIN_U32("graphics/pokemon/eiscue/normal.gbapal.lz"); -const u32 gMonPalette_Indeedee[] = INCBIN_U32("graphics/pokemon/indeedee/normal.gbapal.lz"); -const u32 gMonPalette_Morpeko[] = INCBIN_U32("graphics/pokemon/morpeko/normal.gbapal.lz"); +const u32 gMonPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/normal.gbapal.lz"); +const u32 gMonPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/normal.gbapal.lz"); +const u32 gMonPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/normal.gbapal.lz"); const u32 gMonPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/normal.gbapal.lz"); const u32 gMonPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/normal.gbapal.lz"); const u32 gMonPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/normal.gbapal.lz"); @@ -3546,11 +3546,11 @@ const u32 gMonPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/norma const u32 gMonPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/normal.gbapal.lz"); const u32 gMonPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/normal.gbapal.lz"); const u32 gMonPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/normal.gbapal.lz"); -const u32 gMonPalette_Zacian[] = INCBIN_U32("graphics/pokemon/zacian/normal.gbapal.lz"); -const u32 gMonPalette_Zamazenta[] = INCBIN_U32("graphics/pokemon/zamazenta/normal.gbapal.lz"); +const u32 gMonPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/normal.gbapal.lz"); +const u32 gMonPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/normal.gbapal.lz"); const u32 gMonPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/normal.gbapal.lz"); const u32 gMonPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/normal.gbapal.lz"); -const u32 gMonPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz"); +const u32 gMonPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz"); const u32 gMonPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/normal.gbapal.lz"); const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/normal.gbapal.lz"); const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/normal.gbapal.lz"); @@ -3560,10 +3560,10 @@ const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gb 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_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/normal.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_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz"); #endif const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/normal.gbapal.lz"); const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/normal.gbapal.lz"); @@ -3656,7 +3656,7 @@ const u32 gMonPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzago const u32 gMonPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/normal.gbapal.lz"); #if P_GEN_5_POKEMON == TRUE const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/normal.gbapal.lz"); -const u32 gMonPalette_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/normal.gbapal.lz"); +const u32 gMonPalette_DarmanitanGalarianStandardMode[] = 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"); #endif @@ -3742,7 +3742,7 @@ const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/ 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_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/normal.gbapal.lz"); const u32 gMonPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/normal.gbapal.lz"); const u32 gMonPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/normal.gbapal.lz"); const u32 gMonPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/normal.gbapal.lz"); @@ -3903,7 +3903,7 @@ const u32 gMonPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grim const u32 gMonPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/normal.gbapal.lz"); const u32 gMonPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/normal.gbapal.lz"); const u32 gMonPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/normal.gbapal.lz"); -const u32 gMonPalette_UrshifuGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.gbapal.lz"); +const u32 gMonPalette_UrshifuSingleStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.gbapal.lz"); const u32 gMonPalette_UrshifuRapidStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.gbapal.lz"); #endif const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz"); @@ -4260,7 +4260,7 @@ const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/shin const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/shiny.gbapal.lz"); const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/shiny.gbapal.lz"); const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Castform[] = INCBIN_U32("graphics/pokemon/castform/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/shiny.gbapal.lz"); const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/shiny.gbapal.lz"); const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/shiny.gbapal.lz"); @@ -4295,7 +4295,7 @@ const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/shiny. const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz"); const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz"); #if P_GEN_4_POKEMON == TRUE const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/shiny.gbapal.lz"); const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/shiny.gbapal.lz"); @@ -4322,8 +4322,8 @@ const u32 gMonShinyPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/sh const u32 gMonShinyPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/shiny.gbapal.lz"); const u32 gMonShinyPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz"); +const u32 gMonShinyPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz"); +const u32 gMonShinyPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz"); const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/shiny.gbapal.lz"); const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/shiny.gbapal.lz"); const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/shinyf.gbapal.lz"); @@ -4332,9 +4332,9 @@ const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/ const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/shiny.gbapal.lz"); const u32 gMonShinyPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/normal/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Shellos[] = INCBIN_U32("graphics/pokemon/shellos/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Gastrodon[] = INCBIN_U32("graphics/pokemon/gastrodon/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/shiny.gbapal.lz"); +const u32 gMonShinyPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/shiny.gbapal.lz"); @@ -4400,12 +4400,12 @@ const u32 gMonShinyPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/shiny. const u32 gMonShinyPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/shiny.gbapal.lz"); const u32 gMonShinyPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/shiny.gbapal.lz"); const u32 gMonShinyPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Giratina[] = INCBIN_U32("graphics/pokemon/giratina/shiny.gbapal.lz"); +const u32 gMonShinyPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/shiny.gbapal.lz"); const u32 gMonShinyPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/shiny.gbapal.lz"); const u32 gMonShinyPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/shiny.gbapal.lz"); const u32 gMonShinyPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/shiny.gbapal.lz"); const u32 gMonShinyPalette_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/shiny.gbapal.lz"); #endif #if P_GEN_5_POKEMON == TRUE @@ -4466,12 +4466,12 @@ const u32 gMonShinyPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/sh const u32 gMonShinyPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/shiny.gbapal.lz"); const u32 gMonShinyPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/shiny.gbapal.lz"); const u32 gMonShinyPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Basculin[] = INCBIN_U32("graphics/pokemon/basculin/shiny.gbapal.lz"); +const u32 gMonShinyPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/shiny.gbapal.lz"); const u32 gMonShinyPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/shiny.gbapal.lz"); const u32 gMonShinyPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/shiny.gbapal.lz"); const u32 gMonShinyPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/shiny.gbapal.lz"); const u32 gMonShinyPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Darmanitan[] = INCBIN_U32("graphics/pokemon/darmanitan/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/shiny.gbapal.lz"); const u32 gMonShinyPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/shiny.gbapal.lz"); const u32 gMonShinyPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/shiny.gbapal.lz"); @@ -4501,8 +4501,8 @@ const u32 gMonShinyPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/shiny. const u32 gMonShinyPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/shiny.gbapal.lz"); const u32 gMonShinyPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/shiny.gbapal.lz"); const u32 gMonShinyPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Sawsbuck[] = INCBIN_U32("graphics/pokemon/sawsbuck/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/shiny.gbapal.lz"); +const u32 gMonShinyPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/shiny.gbapal.lz"); const u32 gMonShinyPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/shiny.gbapal.lz"); const u32 gMonShinyPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/shiny.gbapal.lz"); const u32 gMonShinyPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/shiny.gbapal.lz"); @@ -4559,14 +4559,14 @@ const u32 gMonShinyPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/ const u32 gMonShinyPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/shiny.gbapal.lz"); const u32 gMonShinyPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/shiny.gbapal.lz"); const u32 gMonShinyPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tornadus[] = INCBIN_U32("graphics/pokemon/tornadus/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Thundurus[] = INCBIN_U32("graphics/pokemon/thundurus/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/shiny.gbapal.lz"); const u32 gMonShinyPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Landorus[] = INCBIN_U32("graphics/pokemon/landorus/shiny.gbapal.lz"); +const u32 gMonShinyPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/shiny.gbapal.lz"); +const u32 gMonShinyPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/shiny.gbapal.lz"); const u32 gMonShinyPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/shiny.gbapal.lz"); #endif #if P_GEN_6_POKEMON == TRUE @@ -4586,22 +4586,22 @@ const u32 gMonShinyPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchin const u32 gMonShinyPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/shiny.gbapal.lz"); const u32 gMonShinyPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/shiny.gbapal.lz"); +const u32 gMonShinyPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Floette[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Florges[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz"); +const u32 gMonShinyPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz"); +const u32 gMonShinyPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz"); +const u32 gMonShinyPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz"); const u32 gMonShinyPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/shiny.gbapal.lz"); const u32 gMonShinyPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/shiny.gbapal.lz"); +const u32 gMonShinyPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/shiny.gbapal.lz"); const u32 gMonShinyPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/shiny.gbapal.lz"); const u32 gMonShinyPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/shiny.gbapal.lz"); const u32 gMonShinyPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/shiny.gbapal.lz"); const u32 gMonShinyPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/shiny.gbapal.lz"); const u32 gMonShinyPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/shiny.gbapal.lz"); @@ -4636,11 +4636,11 @@ const u32 gMonShinyPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/sh const u32 gMonShinyPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/shiny.gbapal.lz"); const u32 gMonShinyPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/shiny.gbapal.lz"); const u32 gMonShinyPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Xerneas[] = INCBIN_U32("graphics/pokemon/xerneas/shiny.gbapal.lz"); +const u32 gMonShinyPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/shiny.gbapal.lz"); const u32 gMonShinyPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/shiny.gbapal.lz"); const u32 gMonShinyPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/shiny.gbapal.lz"); +const u32 gMonShinyPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/shiny.gbapal.lz"); const u32 gMonShinyPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/shiny.gbapal.lz"); #endif #if P_GEN_7_POKEMON == TRUE @@ -4663,12 +4663,12 @@ const u32 gMonShinyPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/ const u32 gMonShinyPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/shiny.gbapal.lz"); const u32 gMonShinyPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/shiny.gbapal.lz"); const u32 gMonShinyPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Oricorio[] = INCBIN_U32("graphics/pokemon/oricorio/shiny.gbapal.lz"); +const u32 gMonShinyPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/shiny.gbapal.lz"); const u32 gMonShinyPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/shiny.gbapal.lz"); const u32 gMonShinyPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Lycanroc[] = INCBIN_U32("graphics/pokemon/lycanroc/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Wishiwashi[] = INCBIN_U32("graphics/pokemon/wishiwashi/shiny.gbapal.lz"); +const u32 gMonShinyPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/shiny.gbapal.lz"); +const u32 gMonShinyPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/shiny.gbapal.lz"); const u32 gMonShinyPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/shiny.gbapal.lz"); const u32 gMonShinyPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/shiny.gbapal.lz"); const u32 gMonShinyPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/shiny.gbapal.lz"); @@ -4695,12 +4695,12 @@ const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/ const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/shiny.gbapal.lz"); const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Minior[] = INCBIN_U32("graphics/pokemon/minior/shiny.gbapal.lz"); +const u32 gMonShinyPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/shiny.gbapal.lz"); const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/shiny.gbapal.lz"); const u32 gMonShinyPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/shiny.gbapal.lz"); const u32 gMonShinyPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz"); @@ -4773,7 +4773,7 @@ const u32 gMonShinyPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/ const u32 gMonShinyPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/shiny.gbapal.lz"); const u32 gMonShinyPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/shiny.gbapal.lz"); const u32 gMonShinyPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Toxtricity[] = INCBIN_U32("graphics/pokemon/toxtricity/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/shiny.gbapal.lz"); const u32 gMonShinyPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/shiny.gbapal.lz"); const u32 gMonShinyPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/shiny.gbapal.lz"); const u32 gMonShinyPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/shiny.gbapal.lz"); @@ -4799,9 +4799,9 @@ const u32 gMonShinyPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchi const u32 gMonShinyPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/shiny.gbapal.lz"); const u32 gMonShinyPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/shiny.gbapal.lz"); const u32 gMonShinyPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Eiscue[] = INCBIN_U32("graphics/pokemon/eiscue/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Indeedee[] = INCBIN_U32("graphics/pokemon/indeedee/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Morpeko[] = INCBIN_U32("graphics/pokemon/morpeko/shiny.gbapal.lz"); +const u32 gMonShinyPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/shiny.gbapal.lz"); +const u32 gMonShinyPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/shiny.gbapal.lz"); const u32 gMonShinyPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/shiny.gbapal.lz"); @@ -4812,11 +4812,11 @@ const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/ const u32 gMonShinyPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Zacian[] = INCBIN_U32("graphics/pokemon/zacian/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Zamazenta[] = INCBIN_U32("graphics/pokemon/zamazenta/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/shiny.gbapal.lz"); const u32 gMonShinyPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz"); +const u32 gMonShinyPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/shiny.gbapal.lz"); const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/shiny.gbapal.lz"); const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/shiny.gbapal.lz"); @@ -4826,10 +4826,10 @@ const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shin 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_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.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_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); #endif const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/shiny.gbapal.lz"); @@ -4922,7 +4922,7 @@ const u32 gMonShinyPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zi const u32 gMonShinyPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/shiny.gbapal.lz"); #if P_GEN_5_POKEMON == TRUE const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/shiny.gbapal.lz"); -const u32 gMonShinyPalette_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DarmanitanGalarianStandardMode[] = 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"); #endif @@ -5008,7 +5008,7 @@ const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/f 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_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/shiny.gbapal.lz"); @@ -5163,7 +5163,7 @@ const u32 gMonShinyPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon const u32 gMonShinyPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/shiny.gbapal.lz"); const u32 gMonShinyPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/shiny.gbapal.lz"); const u32 gMonShinyPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/shiny.gbapal.lz"); -const u32 gMonShinyPalette_UrshifuGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_UrshifuSingleStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.gbapal.lz"); const u32 gMonShinyPalette_UrshifuRapidStrikeGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.gbapal.lz"); #endif @@ -5518,7 +5518,7 @@ const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/icon.4bpp"); const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/icon.4bpp"); const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/icon.4bpp"); const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/icon.4bpp"); -const u8 gMonIcon_Castform[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp"); +const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp"); const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/icon.4bpp"); const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/icon.4bpp"); const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/banette/icon.4bpp"); @@ -5553,7 +5553,7 @@ const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/icon.4bpp"); const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp"); const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp"); const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp"); -const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); +const u8 gMonIcon_DeoxysNormal[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); #if P_GEN_4_POKEMON == TRUE const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp"); const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp"); @@ -5580,8 +5580,8 @@ const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/icon.4bpp"); const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/icon.4bpp"); const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/icon.4bpp"); const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/icon.4bpp"); -const u8 gMonIcon_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp"); -const u8 gMonIcon_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp"); +const u8 gMonIcon_BurmyPlantCloak[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp"); +const u8 gMonIcon_WormadamPlantCloak[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp"); const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/icon.4bpp"); const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/combee/icon.4bpp"); const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/icon.4bpp"); @@ -5589,9 +5589,9 @@ const u8 gMonIcon_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/icon.4bpp" const u8 gMonIcon_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/icon.4bpp"); const u8 gMonIcon_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/icon.4bpp"); const u8 gMonIcon_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/icon.4bpp"); -const u8 gMonIcon_Cherrim[] = INCBIN_U8("graphics/pokemon/cherrim/icon.4bpp"); -const u8 gMonIcon_Shellos[] = INCBIN_U8("graphics/pokemon/shellos/icon.4bpp"); -const u8 gMonIcon_Gastrodon[] = INCBIN_U8("graphics/pokemon/gastrodon/icon.4bpp"); +const u8 gMonIcon_CherrimOvercast[] = INCBIN_U8("graphics/pokemon/cherrim/icon.4bpp"); +const u8 gMonIcon_ShellosWestSea[] = INCBIN_U8("graphics/pokemon/shellos/icon.4bpp"); +const u8 gMonIcon_GastrodonWestSea[] = INCBIN_U8("graphics/pokemon/gastrodon/icon.4bpp"); const u8 gMonIcon_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/icon.4bpp"); const u8 gMonIcon_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/icon.4bpp"); const u8 gMonIcon_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/icon.4bpp"); @@ -5659,12 +5659,12 @@ const u8 gMonIcon_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/icon.4bpp"); const u8 gMonIcon_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/icon.4bpp"); const u8 gMonIcon_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/icon.4bpp"); const u8 gMonIcon_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/icon.4bpp"); -const u8 gMonIcon_Giratina[] = INCBIN_U8("graphics/pokemon/giratina/icon.4bpp"); +const u8 gMonIcon_GiratinaAltered[] = INCBIN_U8("graphics/pokemon/giratina/icon.4bpp"); const u8 gMonIcon_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/icon.4bpp"); const u8 gMonIcon_Phione[] = INCBIN_U8("graphics/pokemon/phione/icon.4bpp"); const u8 gMonIcon_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/icon.4bpp"); const u8 gMonIcon_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/icon.4bpp"); -const u8 gMonIcon_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp"); +const u8 gMonIcon_ShayminLand[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp"); const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/icon.4bpp"); #endif #if P_GEN_5_POKEMON == TRUE @@ -5725,12 +5725,12 @@ const u8 gMonIcon_Cottonee[] = INCBIN_U8("graphics/pokemon/cottonee/icon.4bpp"); const u8 gMonIcon_Whimsicott[] = INCBIN_U8("graphics/pokemon/whimsicott/icon.4bpp"); const u8 gMonIcon_Petilil[] = INCBIN_U8("graphics/pokemon/petilil/icon.4bpp"); const u8 gMonIcon_Lilligant[] = INCBIN_U8("graphics/pokemon/lilligant/icon.4bpp"); -const u8 gMonIcon_Basculin[] = INCBIN_U8("graphics/pokemon/basculin/icon.4bpp"); +const u8 gMonIcon_BasculinRedStriped[] = INCBIN_U8("graphics/pokemon/basculin/icon.4bpp"); const u8 gMonIcon_Sandile[] = INCBIN_U8("graphics/pokemon/sandile/icon.4bpp"); const u8 gMonIcon_Krokorok[] = INCBIN_U8("graphics/pokemon/krokorok/icon.4bpp"); const u8 gMonIcon_Krookodile[] = INCBIN_U8("graphics/pokemon/krookodile/icon.4bpp"); const u8 gMonIcon_Darumaka[] = INCBIN_U8("graphics/pokemon/darumaka/icon.4bpp"); -const u8 gMonIcon_Darmanitan[] = INCBIN_U8("graphics/pokemon/darmanitan/icon.4bpp"); +const u8 gMonIcon_DarmanitanStandardMode[] = INCBIN_U8("graphics/pokemon/darmanitan/icon.4bpp"); const u8 gMonIcon_Maractus[] = INCBIN_U8("graphics/pokemon/maractus/icon.4bpp"); const u8 gMonIcon_Dwebble[] = INCBIN_U8("graphics/pokemon/dwebble/icon.4bpp"); const u8 gMonIcon_Crustle[] = INCBIN_U8("graphics/pokemon/crustle/icon.4bpp"); @@ -5760,8 +5760,8 @@ const u8 gMonIcon_Swanna[] = INCBIN_U8("graphics/pokemon/swanna/icon.4bpp"); const u8 gMonIcon_Vanillite[] = INCBIN_U8("graphics/pokemon/vanillite/icon.4bpp"); const u8 gMonIcon_Vanillish[] = INCBIN_U8("graphics/pokemon/vanillish/icon.4bpp"); const u8 gMonIcon_Vanilluxe[] = INCBIN_U8("graphics/pokemon/vanilluxe/icon.4bpp"); -const u8 gMonIcon_Deerling[] = INCBIN_U8("graphics/pokemon/deerling/icon.4bpp"); -const u8 gMonIcon_Sawsbuck[] = INCBIN_U8("graphics/pokemon/sawsbuck/icon.4bpp"); +const u8 gMonIcon_DeerlingSpring[] = INCBIN_U8("graphics/pokemon/deerling/icon.4bpp"); +const u8 gMonIcon_SawsbuckSpring[] = INCBIN_U8("graphics/pokemon/sawsbuck/icon.4bpp"); const u8 gMonIcon_Emolga[] = INCBIN_U8("graphics/pokemon/emolga/icon.4bpp"); const u8 gMonIcon_Karrablast[] = INCBIN_U8("graphics/pokemon/karrablast/icon.4bpp"); const u8 gMonIcon_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/icon.4bpp"); @@ -5818,14 +5818,14 @@ const u8 gMonIcon_Volcarona[] = INCBIN_U8("graphics/pokemon/volcarona/icon.4bpp" const u8 gMonIcon_Cobalion[] = INCBIN_U8("graphics/pokemon/cobalion/icon.4bpp"); const u8 gMonIcon_Terrakion[] = INCBIN_U8("graphics/pokemon/terrakion/icon.4bpp"); const u8 gMonIcon_Virizion[] = INCBIN_U8("graphics/pokemon/virizion/icon.4bpp"); -const u8 gMonIcon_Tornadus[] = INCBIN_U8("graphics/pokemon/tornadus/icon.4bpp"); -const u8 gMonIcon_Thundurus[] = INCBIN_U8("graphics/pokemon/thundurus/icon.4bpp"); +const u8 gMonIcon_TornadusIncarnate[] = INCBIN_U8("graphics/pokemon/tornadus/icon.4bpp"); +const u8 gMonIcon_ThundurusIncarnate[] = INCBIN_U8("graphics/pokemon/thundurus/icon.4bpp"); const u8 gMonIcon_Reshiram[] = INCBIN_U8("graphics/pokemon/reshiram/icon.4bpp"); const u8 gMonIcon_Zekrom[] = INCBIN_U8("graphics/pokemon/zekrom/icon.4bpp"); -const u8 gMonIcon_Landorus[] = INCBIN_U8("graphics/pokemon/landorus/icon.4bpp"); +const u8 gMonIcon_LandorusIncarnate[] = INCBIN_U8("graphics/pokemon/landorus/icon.4bpp"); const u8 gMonIcon_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/icon.4bpp"); -const u8 gMonIcon_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/icon.4bpp"); -const u8 gMonIcon_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/icon.4bpp"); +const u8 gMonIcon_KeldeoOrdinary[] = INCBIN_U8("graphics/pokemon/keldeo/icon.4bpp"); +const u8 gMonIcon_MeloettaAria[] = INCBIN_U8("graphics/pokemon/meloetta/icon.4bpp"); const u8 gMonIcon_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/icon.4bpp"); #endif #if P_GEN_6_POKEMON == TRUE @@ -5845,23 +5845,23 @@ const u8 gMonIcon_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/icon.4 const u8 gMonIcon_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/icon.4bpp"); const u8 gMonIcon_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/icon.4bpp"); const u8 gMonIcon_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/icon.4bpp"); -const u8 gMonIcon_Vivillon[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp"); +const u8 gMonIcon_VivillonIcySnow[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp"); const u8 gMonIcon_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/icon.4bpp"); const u8 gMonIcon_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/icon.4bpp"); const u8 gMonIcon_PyroarF[] = INCBIN_U8("graphics/pokemon/pyroar/iconf.4bpp"); -const u8 gMonIcon_Flabebe[] = INCBIN_U8("graphics/pokemon/flabebe/icon.4bpp"); -const u8 gMonIcon_Floette[] = INCBIN_U8("graphics/pokemon/floette/icon.4bpp"); -const u8 gMonIcon_Florges[] = INCBIN_U8("graphics/pokemon/florges/icon.4bpp"); +const u8 gMonIcon_FlabebeRedFlower[] = INCBIN_U8("graphics/pokemon/flabebe/icon.4bpp"); +const u8 gMonIcon_FloetteRedFlower[] = INCBIN_U8("graphics/pokemon/floette/icon.4bpp"); +const u8 gMonIcon_FlorgesRedFlower[] = INCBIN_U8("graphics/pokemon/florges/icon.4bpp"); const u8 gMonIcon_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/icon.4bpp"); const u8 gMonIcon_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/icon.4bpp"); const u8 gMonIcon_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/icon.4bpp"); const u8 gMonIcon_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/icon.4bpp"); -const u8 gMonIcon_Furfrou[] = INCBIN_U8("graphics/pokemon/furfrou/icon.4bpp"); +const u8 gMonIcon_FurfrouNatural[] = INCBIN_U8("graphics/pokemon/furfrou/icon.4bpp"); const u8 gMonIcon_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/icon.4bpp"); -const u8 gMonIcon_Meowstic[] = INCBIN_U8("graphics/pokemon/meowstic/icon.4bpp"); +const u8 gMonIcon_MeowsticMale[] = INCBIN_U8("graphics/pokemon/meowstic/icon.4bpp"); const u8 gMonIcon_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/icon.4bpp"); const u8 gMonIcon_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/icon.4bpp"); -const u8 gMonIcon_Aegislash[] = INCBIN_U8("graphics/pokemon/aegislash/icon.4bpp"); +const u8 gMonIcon_AegislashShield[] = INCBIN_U8("graphics/pokemon/aegislash/icon.4bpp"); const u8 gMonIcon_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/icon.4bpp"); const u8 gMonIcon_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/icon.4bpp"); const u8 gMonIcon_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/icon.4bpp"); @@ -5896,11 +5896,11 @@ const u8 gMonIcon_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/icon.4bpp"); const u8 gMonIcon_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/icon.4bpp"); const u8 gMonIcon_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/icon.4bpp"); const u8 gMonIcon_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/icon.4bpp"); -const u8 gMonIcon_Xerneas[] = INCBIN_U8("graphics/pokemon/xerneas/icon.4bpp"); +const u8 gMonIcon_XerneasNeutral[] = INCBIN_U8("graphics/pokemon/xerneas/icon.4bpp"); const u8 gMonIcon_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/icon.4bpp"); -const u8 gMonIcon_Zygarde[] = INCBIN_U8("graphics/pokemon/zygarde/icon.4bpp"); +const u8 gMonIcon_Zygarde50[] = INCBIN_U8("graphics/pokemon/zygarde/icon.4bpp"); const u8 gMonIcon_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/icon.4bpp"); -const u8 gMonIcon_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/icon.4bpp"); +const u8 gMonIcon_HoopaConfined[] = INCBIN_U8("graphics/pokemon/hoopa/icon.4bpp"); const u8 gMonIcon_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/icon.4bpp"); #endif #if P_GEN_7_POKEMON == TRUE @@ -5923,12 +5923,12 @@ const u8 gMonIcon_Charjabug[] = INCBIN_U8("graphics/pokemon/charjabug/icon.4bpp" const u8 gMonIcon_Vikavolt[] = INCBIN_U8("graphics/pokemon/vikavolt/icon.4bpp"); const u8 gMonIcon_Crabrawler[] = INCBIN_U8("graphics/pokemon/crabrawler/icon.4bpp"); const u8 gMonIcon_Crabominable[] = INCBIN_U8("graphics/pokemon/crabominable/icon.4bpp"); -const u8 gMonIcon_Oricorio[] = INCBIN_U8("graphics/pokemon/oricorio/icon.4bpp"); +const u8 gMonIcon_OricorioBaile[] = INCBIN_U8("graphics/pokemon/oricorio/icon.4bpp"); const u8 gMonIcon_Cutiefly[] = INCBIN_U8("graphics/pokemon/cutiefly/icon.4bpp"); const u8 gMonIcon_Ribombee[] = INCBIN_U8("graphics/pokemon/ribombee/icon.4bpp"); const u8 gMonIcon_Rockruff[] = INCBIN_U8("graphics/pokemon/rockruff/icon.4bpp"); -const u8 gMonIcon_Lycanroc[] = INCBIN_U8("graphics/pokemon/lycanroc/icon.4bpp"); -const u8 gMonIcon_Wishiwashi[] = INCBIN_U8("graphics/pokemon/wishiwashi/icon.4bpp"); +const u8 gMonIcon_LycanrocMidday[] = INCBIN_U8("graphics/pokemon/lycanroc/icon.4bpp"); +const u8 gMonIcon_WishiwashiSolo[] = INCBIN_U8("graphics/pokemon/wishiwashi/icon.4bpp"); const u8 gMonIcon_Mareanie[] = INCBIN_U8("graphics/pokemon/mareanie/icon.4bpp"); const u8 gMonIcon_Toxapex[] = INCBIN_U8("graphics/pokemon/toxapex/icon.4bpp"); const u8 gMonIcon_Mudbray[] = INCBIN_U8("graphics/pokemon/mudbray/icon.4bpp"); @@ -5956,11 +5956,11 @@ const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/icon.4bpp" const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/icon.4bpp"); const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp"); const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/icon.4bpp"); -const u8 gMonIcon_Minior[] = INCBIN_U8("graphics/pokemon/minior/icon.4bpp"); +const u8 gMonIcon_MiniorMeteor[] = INCBIN_U8("graphics/pokemon/minior/icon.4bpp"); const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/komala/icon.4bpp"); const u8 gMonIcon_Turtonator[] = INCBIN_U8("graphics/pokemon/turtonator/icon.4bpp"); const u8 gMonIcon_Togedemaru[] = INCBIN_U8("graphics/pokemon/togedemaru/icon.4bpp"); -const u8 gMonIcon_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp"); +const u8 gMonIcon_MimikyuDisguised[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp"); const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp"); const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp"); const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); @@ -6033,7 +6033,7 @@ const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/icon.4bpp" const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/icon.4bpp"); const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/icon.4bpp"); const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/icon.4bpp"); -const u8 gMonIcon_Toxtricity[] = INCBIN_U8("graphics/pokemon/toxtricity/icon.4bpp"); +const u8 gMonIcon_ToxtricityAmped[] = INCBIN_U8("graphics/pokemon/toxtricity/icon.4bpp"); const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/icon.4bpp"); const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/icon.4bpp"); const u8 gMonIcon_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/icon.4bpp"); @@ -6059,9 +6059,9 @@ const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/icon.4bp const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/snom/icon.4bpp"); const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/icon.4bpp"); const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/icon.4bpp"); -const u8 gMonIcon_Eiscue[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp"); -const u8 gMonIcon_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp"); -const u8 gMonIcon_Morpeko[] = INCBIN_U8("graphics/pokemon/morpeko/icon.4bpp"); +const u8 gMonIcon_EiscueIceFace[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp"); +const u8 gMonIcon_IndeedeeMale[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp"); +const u8 gMonIcon_MorpekoFullBelly[] = INCBIN_U8("graphics/pokemon/morpeko/icon.4bpp"); const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/icon.4bpp"); const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/icon.4bpp"); const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/icon.4bpp"); @@ -6072,11 +6072,11 @@ const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/icon.4bpp" const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/icon.4bpp"); const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/icon.4bpp"); const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/icon.4bpp"); -const u8 gMonIcon_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp"); -const u8 gMonIcon_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp"); +const u8 gMonIcon_ZacianHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp"); +const u8 gMonIcon_ZamazentaHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp"); const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/icon.4bpp"); const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/icon.4bpp"); -const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp"); +const u8 gMonIcon_UrshifuSingleStrikeStyle[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp"); const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/icon.4bpp"); const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp"); const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp"); @@ -6086,10 +6086,10 @@ 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_BasculegionMale[] = INCBIN_U8("graphics/pokemon/basculegion/icon.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_EnamorusIncarnate[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp"); #endif const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/venusaur/mega/icon.4bpp"); const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/charizard/mega_x/icon.4bpp"); @@ -6182,7 +6182,7 @@ const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/ga const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/linoone/galarian/icon.4bpp"); #if P_GEN_5_POKEMON == TRUE const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/galarian/icon.4bpp"); -const u8 gMonIcon_DarmanitanGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp"); +const u8 gMonIcon_DarmanitanGalarianStandardMode[] = 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"); #endif @@ -6278,7 +6278,7 @@ const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4b 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_DarmanitanGalarianZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp"); const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/deerling/summer/icon.4bpp"); const u8 gMonIcon_DeerlingAutumn[] = INCBIN_U8("graphics/pokemon/deerling/autumn/icon.4bpp"); const u8 gMonIcon_DeerlingWinter[] = INCBIN_U8("graphics/pokemon/deerling/winter/icon.4bpp"); @@ -6367,14 +6367,14 @@ const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/magearna const u8 gMonIcon_CramorantGulping[] = INCBIN_U8("graphics/pokemon/cramorant/gulping/icon.4bpp"); const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/cramorant/gorging/icon.4bpp"); const u8 gMonIcon_ToxtricityLowKey[] = INCBIN_U8("graphics/pokemon/toxtricity/low_key/icon.4bpp"); -//const u8 gMonIcon_AlcremieRubyCream[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_cream/icon.4bpp"); -//const u8 gMonIcon_AlcremieMatchaCream[] = INCBIN_U8("graphics/pokemon/alcremie/matcha_cream/icon.4bpp"); -//const u8 gMonIcon_AlcremieMintCream[] = INCBIN_U8("graphics/pokemon/alcremie/mint_cream/icon.4bpp"); -//const u8 gMonIcon_AlcremieLemonCream[] = INCBIN_U8("graphics/pokemon/alcremie/lemon_cream/icon.4bpp"); -//const u8 gMonIcon_AlcremieSaltedCream[] = INCBIN_U8("graphics/pokemon/alcremie/salted_cream/icon.4bpp"); -//const u8 gMonIcon_AlcremieRubySwirl[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_swirl/icon.4bpp"); -//const u8 gMonIcon_AlcremieCaramelSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/caramel_swirl/icon.4bpp"); -//const u8 gMonIcon_AlcremieRainbowSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/rainbow_swirl/icon.4bpp"); +//const u8 gMonIcon_AlcremieStrawberryRubyCream[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieStrawberryMatchaCream[] = INCBIN_U8("graphics/pokemon/alcremie/matcha_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieStrawberryMintCream[] = INCBIN_U8("graphics/pokemon/alcremie/mint_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieStrawberryLemonCream[] = INCBIN_U8("graphics/pokemon/alcremie/lemon_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieStrawberrySaltedCream[] = INCBIN_U8("graphics/pokemon/alcremie/salted_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieStrawberryRubySwirl[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_swirl/icon.4bpp"); +//const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/caramel_swirl/icon.4bpp"); +//const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/rainbow_swirl/icon.4bpp"); const u8 gMonIcon_EiscueNoiceFace[] = INCBIN_U8("graphics/pokemon/eiscue/noice_face/icon.4bpp"); const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/indeedee/female/icon.4bpp"); const u8 gMonIcon_MorpekoHangry[] = INCBIN_U8("graphics/pokemon/morpeko/hangry/icon.4bpp"); @@ -6417,7 +6417,7 @@ const u8 gMonIcon_GrimmsnarlGigantamax[] = INCBIN_U8("graphics/pokemon/grimmsnar const u8 gMonIcon_AlcremieGigantamax[] = INCBIN_U8("graphics/pokemon/alcremie/gigantamax/icon.4bpp"); const u8 gMonIcon_CopperajahGigantamax[] = INCBIN_U8("graphics/pokemon/copperajah/gigantamax/icon.4bpp"); const u8 gMonIcon_DuraludonGigantamax[] = INCBIN_U8("graphics/pokemon/duraludon/gigantamax/icon.4bpp"); -const u8 gMonIcon_UrshifuGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.4bpp"); +const u8 gMonIcon_UrshifuSingleStrikeGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.4bpp"); const u8 gMonIcon_UrshifuRapidStrikeGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.4bpp"); #endif const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index b6cc938b70..1a71800e3a 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -2579,7 +2579,7 @@ const u16 gEggMoves[] = { MOVE_FLOWER_SHIELD, MOVE_GRASSY_TERRAIN), - egg_moves(SHELLOS, + egg_moves(SHELLOS_WEST_SEA, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_STOCKPILE, @@ -3865,7 +3865,7 @@ const u16 gEggMoves[] = { MOVE_ENDEAVOR, MOVE_AMNESIA), - egg_moves(ORICORIO, + egg_moves(ORICORIO_BAILE, MOVE_PLUCK, MOVE_TAILWIND, MOVE_SAFEGUARD, diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index b26f577257..8b3bc8023c 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -296,12 +296,12 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_BUDEW] = {{EVO_FRIENDSHIP_DAY, 0, SPECIES_ROSELIA}}, [SPECIES_CRANIDOS] = {{EVO_LEVEL, 30, SPECIES_RAMPARDOS}}, [SPECIES_SHIELDON] = {{EVO_LEVEL, 30, SPECIES_BASTIODON}}, - [SPECIES_BURMY] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM}, + [SPECIES_BURMY_PLANT_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_PLANT_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, [SPECIES_COMBEE] = {{EVO_LEVEL_FEMALE, 21, SPECIES_VESPIQUEN}}, [SPECIES_BUIZEL] = {{EVO_LEVEL, 26, SPECIES_FLOATZEL}}, - [SPECIES_CHERUBI] = {{EVO_LEVEL, 25, SPECIES_CHERRIM}}, - [SPECIES_SHELLOS] = {{EVO_LEVEL, 30, SPECIES_GASTRODON}}, + [SPECIES_CHERUBI] = {{EVO_LEVEL, 25, SPECIES_CHERRIM_OVERCAST}}, + [SPECIES_SHELLOS_WEST_SEA] = {{EVO_LEVEL, 30, SPECIES_GASTRODON_WEST_SEA}}, [SPECIES_DRIFLOON] = {{EVO_LEVEL, 28, SPECIES_DRIFBLIM}}, [SPECIES_BUNEARY] = {{EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY}}, [SPECIES_GLAMEOW] = {{EVO_LEVEL, 38, SPECIES_PURUGLY}}, @@ -362,7 +362,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}}, [SPECIES_SANDILE] = {{EVO_LEVEL, 29, SPECIES_KROKOROK}}, [SPECIES_KROKOROK] = {{EVO_LEVEL, 40, SPECIES_KROOKODILE}}, - [SPECIES_DARUMAKA] = {{EVO_LEVEL, 35, SPECIES_DARMANITAN}}, + [SPECIES_DARUMAKA] = {{EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}}, [SPECIES_DWEBBLE] = {{EVO_LEVEL, 34, SPECIES_CRUSTLE}}, [SPECIES_SCRAGGY] = {{EVO_LEVEL, 39, SPECIES_SCRAFTY}}, [SPECIES_YAMASK] = {{EVO_LEVEL, 34, SPECIES_COFAGRIGUS}}, @@ -379,7 +379,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_DUCKLETT] = {{EVO_LEVEL, 35, SPECIES_SWANNA}}, [SPECIES_VANILLITE] = {{EVO_LEVEL, 35, SPECIES_VANILLISH}}, [SPECIES_VANILLISH] = {{EVO_LEVEL, 47, SPECIES_VANILLUXE}}, - [SPECIES_DEERLING] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK}}, + [SPECIES_DEERLING_SPRING] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SPRING}}, [SPECIES_KARRABLAST] = {{EVO_TRADE_SPECIFIC_MON, SPECIES_SHELMET, SPECIES_ESCAVALIER}}, [SPECIES_FOONGUS] = {{EVO_LEVEL, 39, SPECIES_AMOONGUSS}}, [SPECIES_FRILLISH] = {{EVO_LEVEL, 40, SPECIES_JELLICENT}}, @@ -417,16 +417,16 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_FLETCHLING] = {{EVO_LEVEL, 17, SPECIES_FLETCHINDER}}, [SPECIES_FLETCHINDER] = {{EVO_LEVEL, 35, SPECIES_TALONFLAME}}, [SPECIES_SCATTERBUG] = {{EVO_LEVEL, 9, SPECIES_SPEWPA}}, - [SPECIES_SPEWPA] = {{EVO_LEVEL, 12, SPECIES_VIVILLON}}, + [SPECIES_SPEWPA] = {{EVO_LEVEL, 12, SPECIES_VIVILLON_ICY_SNOW}}, [SPECIES_LITLEO] = {{EVO_LEVEL, 35, SPECIES_PYROAR}}, - [SPECIES_FLABEBE] = {{EVO_LEVEL, 19, SPECIES_FLOETTE}}, - [SPECIES_FLOETTE] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES}}, + [SPECIES_FLABEBE_RED_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_RED_FLOWER}}, + [SPECIES_FLOETTE_RED_FLOWER] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_RED_FLOWER}}, [SPECIES_SKIDDO] = {{EVO_LEVEL, 32, SPECIES_GOGOAT}}, [SPECIES_PANCHAM] = {{EVO_LEVEL_DARK_TYPE_MON_IN_PARTY, 32, SPECIES_PANGORO}}, - [SPECIES_ESPURR] = {{EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC}, + [SPECIES_ESPURR] = {{EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_MALE}, {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}}, [SPECIES_HONEDGE] = {{EVO_LEVEL, 35, SPECIES_DOUBLADE}}, - [SPECIES_DOUBLADE] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_AEGISLASH}}, + [SPECIES_DOUBLADE] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_AEGISLASH_SHIELD}}, [SPECIES_SPRITZEE] = {{EVO_TRADE_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}, {EVO_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}}, [SPECIES_SWIRLIX] = {{EVO_TRADE_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}, @@ -446,8 +446,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_LEVEL_FOG, 50, SPECIES_GOODRA_HISUIAN}}, [SPECIES_PHANTUMP] = {{EVO_TRADE, 0, SPECIES_TREVENANT}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_TREVENANT}}, - [SPECIES_PUMPKABOO] = {{EVO_TRADE, 0, SPECIES_GOURGEIST}, - {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST}}, + [SPECIES_PUMPKABOO_AVERAGE] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_AVERAGE}, + {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_AVERAGE}}, [SPECIES_BERGMITE] = {{EVO_LEVEL, 37, SPECIES_AVALUGG}, {EVO_NONE, 0, SPECIES_AVALUGG_HISUIAN}}, [SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN}}, @@ -469,7 +469,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_CRABRAWLER] = {{EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_CRABOMINABLE}, {EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE}}, [SPECIES_CUTIEFLY] = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE}}, - [SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC}, + [SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC_MIDDAY}, {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_MIDNIGHT}}, [SPECIES_MAREANIE] = {{EVO_LEVEL, 38, SPECIES_TOXAPEX}}, [SPECIES_MUDBRAY] = {{EVO_LEVEL, 30, SPECIES_MUDSDALE}}, @@ -482,7 +482,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_STEENEE] = {{EVO_MOVE, MOVE_STOMP, SPECIES_TSAREENA}}, [SPECIES_WIMPOD] = {{EVO_LEVEL, 30, SPECIES_GOLISOPOD}}, [SPECIES_SANDYGAST] = {{EVO_LEVEL, 42, SPECIES_PALOSSAND}}, - [SPECIES_TYPE_NULL] = {{EVO_FRIENDSHIP, 0, SPECIES_SILVALLY}}, + [SPECIES_TYPE_NULL] = {{EVO_FRIENDSHIP, 0, SPECIES_SILVALLY_NORMAL}}, [SPECIES_JANGMO_O] = {{EVO_LEVEL, 35, SPECIES_HAKAMO_O}}, [SPECIES_HAKAMO_O] = {{EVO_LEVEL, 45, SPECIES_KOMMO_O}}, [SPECIES_COSMOG] = {{EVO_LEVEL, 43, SPECIES_COSMOEM}}, @@ -513,30 +513,30 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}}, [SPECIES_SILICOBRA] = {{EVO_LEVEL, 36, SPECIES_SANDACONDA}}, [SPECIES_ARROKUDA] = {{EVO_LEVEL, 26, SPECIES_BARRASKEWDA}}, - [SPECIES_TOXEL] = {{EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY}, + [SPECIES_TOXEL] = {{EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED}, {EVO_LEVEL_NATURE_LOW_KEY, 30, SPECIES_TOXTRICITY_LOW_KEY}}, [SPECIES_SIZZLIPEDE] = {{EVO_LEVEL, 28, SPECIES_CENTISKORCH}}, [SPECIES_CLOBBOPUS] = {{EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT}}, - [SPECIES_SINISTEA] = {{EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST}}, + [SPECIES_SINISTEA_PHONY] = {{EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST_PHONY}}, [SPECIES_HATENNA] = {{EVO_LEVEL, 32, SPECIES_HATTREM}}, [SPECIES_HATTREM] = {{EVO_LEVEL, 42, SPECIES_HATTERENE}}, [SPECIES_IMPIDIMP] = {{EVO_LEVEL, 32, SPECIES_MORGREM}}, [SPECIES_MORGREM] = {{EVO_LEVEL, 42, SPECIES_GRIMMSNARL}}, - [SPECIES_MILCERY] = {{EVO_LEVEL, 0, SPECIES_ALCREMIE}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_RUBY_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_MATCHA_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_MINT_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_LEMON_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_SALTED_CREAM}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_RUBY_SWIRL}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_CARAMEL_SWIRL}, - {EVO_LEVEL, 0, SPECIES_ALCREMIE_RAINBOW_SWIRL}}, + [SPECIES_MILCERY] = {{EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM}, + {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM}, + {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM}, + {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM}, + {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM}, + {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM}, + {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL}, + {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL}, + {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL}}, [SPECIES_SNOM] = {{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH}}, [SPECIES_CUFANT] = {{EVO_LEVEL, 34, SPECIES_COPPERAJAH}}, [SPECIES_DREEPY] = {{EVO_LEVEL, 50, SPECIES_DRAKLOAK}}, [SPECIES_DRAKLOAK] = {{EVO_LEVEL, 60, SPECIES_DRAGAPULT}}, - [SPECIES_KUBFU] = {{EVO_DARK_SCROLL, 0, SPECIES_URSHIFU}, - {EVO_ITEM, ITEM_SCROLL_OF_DARKNESS, SPECIES_URSHIFU}, + [SPECIES_KUBFU] = {{EVO_DARK_SCROLL, 0, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, + {EVO_ITEM, ITEM_SCROLL_OF_DARKNESS, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, {EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}, {EVO_ITEM, ITEM_SCROLL_OF_WATERS, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}}, #endif @@ -561,11 +561,11 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_CORSOLA_GALARIAN] = {{EVO_LEVEL, 38, SPECIES_CURSOLA}}, [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, [SPECIES_LINOONE_GALARIAN] = {{EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}}, - [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}}, + [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}}, [SPECIES_YAMASK_GALARIAN] = {{EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}}, #else [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, - [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}}, + [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}}, #endif #if P_GEN_4_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK}, diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index 9e81bdab67..bd8f42a3e2 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -84,7 +84,7 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_ALTARIA_MEGA] = sAltariaFormChangeTable, [SPECIES_ABSOL] = sAbsolFormChangeTable, [SPECIES_ABSOL_MEGA] = sAbsolFormChangeTable, - [SPECIES_CASTFORM] = sCastformFormChangeTable, + [SPECIES_CASTFORM_NORMAL] = sCastformFormChangeTable, [SPECIES_CASTFORM_SUNNY] = sCastformFormChangeTable, [SPECIES_CASTFORM_RAINY] = sCastformFormChangeTable, [SPECIES_CASTFORM_SNOWY] = sCastformFormChangeTable, @@ -109,10 +109,10 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_RAYQUAZA] = sRayquazaFormChangeTable, [SPECIES_RAYQUAZA_MEGA] = sRayquazaFormChangeTable, #if P_GEN_4_POKEMON == TRUE - [SPECIES_BURMY] = sBurmyFormChangeTable, + [SPECIES_BURMY_PLANT_CLOAK] = sBurmyFormChangeTable, [SPECIES_BURMY_SANDY_CLOAK] = sBurmyFormChangeTable, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyFormChangeTable, - [SPECIES_CHERRIM] = sCherrimFormChangeTable, + [SPECIES_CHERRIM_OVERCAST] = sCherrimFormChangeTable, [SPECIES_CHERRIM_SUNSHINE] = sCherrimFormChangeTable, [SPECIES_LOPUNNY] = sLopunnyFormChangeTable, [SPECIES_LOPUNNY_MEGA] = sLopunnyFormChangeTable, @@ -128,11 +128,11 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_DIALGA_ORIGIN] = sDialgaFormChangeTable, [SPECIES_PALKIA] = sPalkiaFormChangeTable, [SPECIES_PALKIA_ORIGIN] = sPalkiaFormChangeTable, - [SPECIES_GIRATINA] = sGiratinaFormChangeTable, + [SPECIES_GIRATINA_ALTERED] = sGiratinaFormChangeTable, [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormChangeTable, - [SPECIES_SHAYMIN] = sShayminFormChangeTable, + [SPECIES_SHAYMIN_LAND] = sShayminFormChangeTable, [SPECIES_SHAYMIN_SKY] = sShayminFormChangeTable, - [SPECIES_ARCEUS] = sArceusFormChangeTable, + [SPECIES_ARCEUS_NORMAL] = sArceusFormChangeTable, [SPECIES_ARCEUS_FIGHTING] = sArceusFormChangeTable, [SPECIES_ARCEUS_FLYING] = sArceusFormChangeTable, [SPECIES_ARCEUS_POISON] = sArceusFormChangeTable, @@ -154,21 +154,21 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = #if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO] = sAudinoFormChangeTable, [SPECIES_AUDINO_MEGA] = sAudinoFormChangeTable, - [SPECIES_DARMANITAN] = sDarmanitanFormChangeTable, + [SPECIES_DARMANITAN_STANDARD_MODE] = sDarmanitanFormChangeTable, [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanFormChangeTable, - [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianFormChangeTable, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanGalarianFormChangeTable, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = sDarmanitanGalarianFormChangeTable, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanGalarianFormChangeTable, [SPECIES_GARBODOR] = sGarbodorFormChangeTable, [SPECIES_GARBODOR_GIGANTAMAX] = sGarbodorFormChangeTable, - [SPECIES_TORNADUS] = sTornadusFormChangeTable, + [SPECIES_TORNADUS_INCARNATE] = sTornadusFormChangeTable, [SPECIES_TORNADUS_THERIAN] = sTornadusFormChangeTable, - [SPECIES_THUNDURUS] = sThundurusFormChangeTable, + [SPECIES_THUNDURUS_INCARNATE] = sThundurusFormChangeTable, [SPECIES_THUNDURUS_THERIAN] = sThundurusFormChangeTable, - [SPECIES_LANDORUS] = sLandorusFormChangeTable, + [SPECIES_LANDORUS_INCARNATE] = sLandorusFormChangeTable, [SPECIES_LANDORUS_THERIAN] = sLandorusFormChangeTable, - [SPECIES_KELDEO] = sKeldeoFormChangeTable, + [SPECIES_KELDEO_ORDINARY] = sKeldeoFormChangeTable, [SPECIES_KELDEO_RESOLUTE] = sKeldeoFormChangeTable, - [SPECIES_MELOETTA] = sMeloettaFormChangeTable, + [SPECIES_MELOETTA_ARIA] = sMeloettaFormChangeTable, [SPECIES_MELOETTA_PIROUETTE] = sMeloettaFormChangeTable, [SPECIES_GENESECT] = sGenesectFormChangeTable, [SPECIES_GENESECT_DOUSE_DRIVE] = sGenesectFormChangeTable, @@ -179,26 +179,26 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = #if P_GEN_6_POKEMON == TRUE [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaBattleBondFormChangeTable, [SPECIES_GRENINJA_ASH] = sGreninjaBattleBondFormChangeTable, - [SPECIES_AEGISLASH] = sAegislashFormChangeTable, + [SPECIES_AEGISLASH_SHIELD] = sAegislashFormChangeTable, [SPECIES_AEGISLASH_BLADE] = sAegislashFormChangeTable, - [SPECIES_XERNEAS] = sXerneasFormChangeTable, + [SPECIES_XERNEAS_NEUTRAL] = sXerneasFormChangeTable, [SPECIES_XERNEAS_ACTIVE] = sXerneasFormChangeTable, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardePowerConstructFormChangeTable, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardePowerConstructFormChangeTable, [SPECIES_ZYGARDE_COMPLETE] = sZygardePowerConstructFormChangeTable, [SPECIES_DIANCIE] = sDiancieFormChangeTable, [SPECIES_DIANCIE_MEGA] = sDiancieFormChangeTable, - [SPECIES_HOOPA] = sHoopaFormChangeTable, + [SPECIES_HOOPA_CONFINED] = sHoopaFormChangeTable, [SPECIES_HOOPA_UNBOUND] = sHoopaFormChangeTable, #endif #if P_GEN_7_POKEMON == TRUE - [SPECIES_ORICORIO] = sOricorioFormChangeTable, + [SPECIES_ORICORIO_BAILE] = sOricorioFormChangeTable, [SPECIES_ORICORIO_POM_POM] = sOricorioFormChangeTable, [SPECIES_ORICORIO_PAU] = sOricorioFormChangeTable, [SPECIES_ORICORIO_SENSU] = sOricorioFormChangeTable, - [SPECIES_WISHIWASHI] = sWishiwashiFormChangeTable, + [SPECIES_WISHIWASHI_SOLO] = sWishiwashiFormChangeTable, [SPECIES_WISHIWASHI_SCHOOL] = sWishiwashiFormChangeTable, - [SPECIES_SILVALLY] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_NORMAL] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_BUG] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_DARK] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_DRAGON] = sSilvallyFormChangeTable, @@ -216,9 +216,9 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_SILVALLY_ROCK] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable, - [SPECIES_MIMIKYU] = sMimikyuFormChangeTable, + [SPECIES_MIMIKYU_DISGUISED] = sMimikyuFormChangeTable, [SPECIES_MIMIKYU_BUSTED] = sMimikyuFormChangeTable, - [SPECIES_MINIOR] = sMiniorRedFormChangeTable, + [SPECIES_MINIOR_METEOR_RED] = sMiniorRedFormChangeTable, [SPECIES_MINIOR_CORE_RED] = sMiniorRedFormChangeTable, [SPECIES_MINIOR_METEOR_BLUE] = sMiniorBlueFormChangeTable, [SPECIES_MINIOR_CORE_BLUE] = sMiniorBlueFormChangeTable, @@ -273,23 +273,23 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_GRIMMSNARL_GIGANTAMAX] = sGrimmsnarlFormChangeTable, [SPECIES_ALCREMIE] = sAlcremieFormChangeTable, [SPECIES_ALCREMIE_GIGANTAMAX] = sAlcremieFormChangeTable, - [SPECIES_EISCUE] = sEiscueFormChangeTable, + [SPECIES_EISCUE_ICE_FACE] = sEiscueFormChangeTable, [SPECIES_EISCUE_NOICE_FACE] = sEiscueFormChangeTable, - [SPECIES_MORPEKO] = sMorpekoFormChangeTable, + [SPECIES_MORPEKO_FULL_BELLY] = sMorpekoFormChangeTable, [SPECIES_MORPEKO_HANGRY] = sMorpekoFormChangeTable, [SPECIES_COPPERAJAH] = sCopperajahFormChangeTable, [SPECIES_COPPERAJAH_GIGANTAMAX] = sCopperajahFormChangeTable, [SPECIES_DURALUDON] = sDuraludonFormChangeTable, [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonFormChangeTable, - [SPECIES_ZACIAN] = sZacianFormChangeTable, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sZacianFormChangeTable, [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianFormChangeTable, - [SPECIES_ZAMAZENTA] = sZamazentaFormChangeTable, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaFormChangeTable, [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaFormChangeTable, - [SPECIES_URSHIFU] = sUrshifuFormChangeTable, - [SPECIES_URSHIFU_GIGANTAMAX] = sUrshifuFormChangeTable, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = sUrshifuSingleStrikeFormChangeTable, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuSingleStrikeFormChangeTable, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = sUrshifuRapidStrikeFormChangeTable, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeFormChangeTable, - [SPECIES_ENAMORUS] = sEnamorusFormChangeTable, + [SPECIES_ENAMORUS_INCARNATE] = sEnamorusFormChangeTable, [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormChangeTable, #endif }; diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index 81ca9bd150..f339130fac 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -164,18 +164,18 @@ static const struct FormChange sCastformFormChangeTable[] = { {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SUNNY, B_WEATHER_SUN, ABILITY_FORECAST}, {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_RAINY, B_WEATHER_RAIN, ABILITY_FORECAST}, {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SNOWY, B_WEATHER_HAIL | B_WEATHER_SNOW, ABILITY_FORECAST}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM, ~(B_WEATHER_SUN | B_WEATHER_RAIN | B_WEATHER_HAIL | B_WEATHER_SNOW), ABILITY_FORECAST}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM, B_WEATHER_NONE, ABILITY_FORECAST}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, ~(B_WEATHER_SUN | B_WEATHER_RAIN | B_WEATHER_HAIL | B_WEATHER_SNOW), ABILITY_FORECAST}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, B_WEATHER_NONE, ABILITY_FORECAST}, #else {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SUNNY, B_WEATHER_SUN}, {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_RAINY, B_WEATHER_RAIN}, {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SNOWY, B_WEATHER_HAIL | B_WEATHER_SNOW}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM, ~(B_WEATHER_SUN | B_WEATHER_RAIN | B_WEATHER_HAIL | B_WEATHER_SNOW)}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM, B_WEATHER_NONE}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, ~(B_WEATHER_SUN | B_WEATHER_RAIN | B_WEATHER_HAIL | B_WEATHER_SNOW)}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, B_WEATHER_NONE}, #endif - {FORM_CHANGE_BATTLE_SWITCH, SPECIES_CASTFORM}, - {FORM_CHANGE_FAINT, SPECIES_CASTFORM}, - {FORM_CHANGE_END_BATTLE, SPECIES_CASTFORM}, + {FORM_CHANGE_BATTLE_SWITCH, SPECIES_CASTFORM_NORMAL}, + {FORM_CHANGE_FAINT, SPECIES_CASTFORM_NORMAL}, + {FORM_CHANGE_END_BATTLE, SPECIES_CASTFORM_NORMAL}, {FORM_CHANGE_TERMINATOR}, }; @@ -231,11 +231,11 @@ static const struct FormChange sRayquazaFormChangeTable[] = { #if P_GEN_4_POKEMON == TRUE static const struct FormChange sBurmyFormChangeTable[] = { - {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY, BATTLE_TERRAIN_GRASS}, - {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY, BATTLE_TERRAIN_LONG_GRASS}, - {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY, BATTLE_TERRAIN_POND}, - {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY, BATTLE_TERRAIN_MOUNTAIN}, - {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY, BATTLE_TERRAIN_PLAIN}, + {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_GRASS}, + {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_LONG_GRASS}, + {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_POND}, + {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_MOUNTAIN}, + {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_PLANT_CLOAK, BATTLE_TERRAIN_PLAIN}, {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_SANDY_CLOAK, BATTLE_TERRAIN_CAVE}, {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_SANDY_CLOAK, BATTLE_TERRAIN_SAND}, {FORM_CHANGE_END_BATTLE_TERRAIN, SPECIES_BURMY_TRASH_CLOAK, BATTLE_TERRAIN_BUILDING}, @@ -245,16 +245,16 @@ static const struct FormChange sBurmyFormChangeTable[] = { static const struct FormChange sCherrimFormChangeTable[] = { #if B_WEATHER_FORMS >= GEN_5 {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_SUNSHINE, B_WEATHER_SUN, ABILITY_FLOWER_GIFT}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM, ~B_WEATHER_SUN, ABILITY_FLOWER_GIFT}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM, B_WEATHER_NONE, ABILITY_FLOWER_GIFT}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, ~B_WEATHER_SUN, ABILITY_FLOWER_GIFT}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, B_WEATHER_NONE, ABILITY_FLOWER_GIFT}, #else {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_SUNSHINE, B_WEATHER_SUN}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM, ~B_WEATHER_SUN}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM, B_WEATHER_NONE}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, ~B_WEATHER_SUN}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, B_WEATHER_NONE}, #endif - {FORM_CHANGE_BATTLE_SWITCH, SPECIES_CHERRIM}, - {FORM_CHANGE_FAINT, SPECIES_CHERRIM}, - {FORM_CHANGE_END_BATTLE, SPECIES_CHERRIM}, + {FORM_CHANGE_BATTLE_SWITCH, SPECIES_CHERRIM_OVERCAST}, + {FORM_CHANGE_FAINT, SPECIES_CHERRIM_OVERCAST}, + {FORM_CHANGE_END_BATTLE, SPECIES_CHERRIM_OVERCAST}, {FORM_CHANGE_TERMINATOR}, }; @@ -296,7 +296,7 @@ static const struct FormChange sPalkiaFormChangeTable[] = { }; static const struct FormChange sGiratinaFormChangeTable[] = { - {FORM_CHANGE_ITEM_HOLD, SPECIES_GIRATINA, ITEM_NONE}, + {FORM_CHANGE_ITEM_HOLD, SPECIES_GIRATINA_ALTERED, ITEM_NONE}, #if I_GRISEOUS_ORB_FORM_CHANGE < GEN_9 {FORM_CHANGE_ITEM_HOLD, SPECIES_GIRATINA_ORIGIN, ITEM_GRISEOUS_ORB}, #endif @@ -306,12 +306,12 @@ static const struct FormChange sGiratinaFormChangeTable[] = { static const struct FormChange sShayminFormChangeTable[] = { {FORM_CHANGE_ITEM_USE, SPECIES_SHAYMIN_SKY, ITEM_GRACIDEA, DAY}, - // {FORM_CHANGE_WITHDRAW, SPECIES_SHAYMIN}, + // {FORM_CHANGE_WITHDRAW, SPECIES_SHAYMIN_LAND}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sArceusFormChangeTable[] = { - {FORM_CHANGE_ITEM_HOLD, SPECIES_ARCEUS, ITEM_NONE, ABILITY_MULTITYPE}, + {FORM_CHANGE_ITEM_HOLD, SPECIES_ARCEUS_NORMAL, ITEM_NONE, ABILITY_MULTITYPE}, {FORM_CHANGE_ITEM_HOLD, SPECIES_ARCEUS_FIGHTING, ITEM_FIST_PLATE, ABILITY_MULTITYPE}, {FORM_CHANGE_ITEM_HOLD, SPECIES_ARCEUS_FIGHTING, ITEM_FIGHTINIUM_Z, ABILITY_MULTITYPE}, {FORM_CHANGE_ITEM_HOLD, SPECIES_ARCEUS_FLYING, ITEM_SKY_PLATE, ABILITY_MULTITYPE}, @@ -357,48 +357,48 @@ static const struct FormChange sAudinoFormChangeTable[] = { }; static const struct FormChange sDarmanitanFormChangeTable[] = { - {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50}, - {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_ZEN_MODE, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50}, - {FORM_CHANGE_FAINT, SPECIES_DARMANITAN}, - {FORM_CHANGE_END_BATTLE, SPECIES_DARMANITAN}, + {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_STANDARD_MODE, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50}, + {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_ZEN_MODE, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50}, + {FORM_CHANGE_FAINT, SPECIES_DARMANITAN_STANDARD_MODE}, + {FORM_CHANGE_END_BATTLE, SPECIES_DARMANITAN_STANDARD_MODE}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sDarmanitanGalarianFormChangeTable[] = { - {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALARIAN, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50}, - {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_ZEN_MODE_GALARIAN, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50}, - {FORM_CHANGE_FAINT, SPECIES_DARMANITAN_GALARIAN}, - {FORM_CHANGE_END_BATTLE, SPECIES_DARMANITAN_GALARIAN}, + {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50}, + {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50}, + {FORM_CHANGE_FAINT, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}, + {FORM_CHANGE_END_BATTLE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sMeloettaFormChangeTable[] = { - {FORM_CHANGE_FAINT, SPECIES_MELOETTA}, - {FORM_CHANGE_END_BATTLE, SPECIES_MELOETTA}, + {FORM_CHANGE_FAINT, SPECIES_MELOETTA_ARIA}, + {FORM_CHANGE_END_BATTLE, SPECIES_MELOETTA_ARIA}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sTornadusFormChangeTable[] = { - {FORM_CHANGE_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, - {FORM_CHANGE_ITEM_USE, SPECIES_TORNADUS, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_ITEM_USE, SPECIES_TORNADUS_INCARNATE, ITEM_REVEAL_GLASS}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sThundurusFormChangeTable[] = { - {FORM_CHANGE_ITEM_USE, SPECIES_THUNDURUS_THERIAN, ITEM_REVEAL_GLASS}, - {FORM_CHANGE_ITEM_USE, SPECIES_THUNDURUS, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_ITEM_USE, SPECIES_THUNDURUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_ITEM_USE, SPECIES_THUNDURUS_INCARNATE, ITEM_REVEAL_GLASS}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sLandorusFormChangeTable[] = { - {FORM_CHANGE_ITEM_USE, SPECIES_LANDORUS_THERIAN, ITEM_REVEAL_GLASS}, - {FORM_CHANGE_ITEM_USE, SPECIES_LANDORUS, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_ITEM_USE, SPECIES_LANDORUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_ITEM_USE, SPECIES_LANDORUS_INCARNATE, ITEM_REVEAL_GLASS}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sKeldeoFormChangeTable[] = { // {FORM_CHANGE_MOVE, SPECIES_KELDEO_RESOLUTE, MOVE_SECRET_SWORD, WHEN_LEARNED}, - // {FORM_CHANGE_MOVE, SPECIES_KELDEO, MOVE_SECRET_SWORD, WHEN_FORGOTTEN}, + // {FORM_CHANGE_MOVE, SPECIES_KELDEO_ORDINARY, MOVE_SECRET_SWORD, WHEN_FORGOTTEN}, {FORM_CHANGE_TERMINATOR}, }; @@ -420,15 +420,15 @@ static const struct FormChange sGreninjaBattleBondFormChangeTable[] = { }; static const struct FormChange sAegislashFormChangeTable[] = { - {FORM_CHANGE_BATTLE_SWITCH, SPECIES_AEGISLASH}, - {FORM_CHANGE_FAINT, SPECIES_AEGISLASH}, - {FORM_CHANGE_END_BATTLE, SPECIES_AEGISLASH}, + {FORM_CHANGE_BATTLE_SWITCH, SPECIES_AEGISLASH_SHIELD}, + {FORM_CHANGE_FAINT, SPECIES_AEGISLASH_SHIELD}, + {FORM_CHANGE_END_BATTLE, SPECIES_AEGISLASH_SHIELD}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sXerneasFormChangeTable[] = { {FORM_CHANGE_BEGIN_BATTLE, SPECIES_XERNEAS_ACTIVE}, - {FORM_CHANGE_END_BATTLE, SPECIES_XERNEAS, }, + {FORM_CHANGE_END_BATTLE, SPECIES_XERNEAS_NEUTRAL}, {FORM_CHANGE_TERMINATOR}, }; @@ -445,15 +445,15 @@ static const struct FormChange sDiancieFormChangeTable[] = { }; static const struct FormChange sHoopaFormChangeTable[] = { - {FORM_CHANGE_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA}, - {FORM_CHANGE_WITHDRAW, SPECIES_HOOPA}, + {FORM_CHANGE_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA_CONFINED}, + {FORM_CHANGE_WITHDRAW, SPECIES_HOOPA_CONFINED}, {FORM_CHANGE_TERMINATOR}, }; #endif #if P_GEN_7_POKEMON == TRUE static const struct FormChange sOricorioFormChangeTable[] = { - {FORM_CHANGE_ITEM_USE, SPECIES_ORICORIO, ITEM_RED_NECTAR}, + {FORM_CHANGE_ITEM_USE, SPECIES_ORICORIO_BAILE, ITEM_RED_NECTAR}, {FORM_CHANGE_ITEM_USE, SPECIES_ORICORIO_POM_POM, ITEM_YELLOW_NECTAR}, {FORM_CHANGE_ITEM_USE, SPECIES_ORICORIO_PAU, ITEM_PINK_NECTAR}, {FORM_CHANGE_ITEM_USE, SPECIES_ORICORIO_SENSU, ITEM_PURPLE_NECTAR}, @@ -461,15 +461,15 @@ static const struct FormChange sOricorioFormChangeTable[] = { }; static const struct FormChange sWishiwashiFormChangeTable[] = { {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_WISHIWASHI_SCHOOL, ABILITY_SCHOOLING, HP_HIGHER_THAN, 25}, - {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_WISHIWASHI, ABILITY_SCHOOLING, HP_LOWER_EQ_THAN, 25}, - {FORM_CHANGE_BATTLE_SWITCH, SPECIES_WISHIWASHI}, - {FORM_CHANGE_FAINT, SPECIES_WISHIWASHI}, - {FORM_CHANGE_END_BATTLE, SPECIES_WISHIWASHI}, + {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_WISHIWASHI_SOLO, ABILITY_SCHOOLING, HP_LOWER_EQ_THAN, 25}, + {FORM_CHANGE_BATTLE_SWITCH, SPECIES_WISHIWASHI_SOLO}, + {FORM_CHANGE_FAINT, SPECIES_WISHIWASHI_SOLO}, + {FORM_CHANGE_END_BATTLE, SPECIES_WISHIWASHI_SOLO}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sSilvallyFormChangeTable[] = { - {FORM_CHANGE_ITEM_HOLD, SPECIES_SILVALLY, ITEM_NONE, ABILITY_RKS_SYSTEM}, + {FORM_CHANGE_ITEM_HOLD, SPECIES_SILVALLY_NORMAL, ITEM_NONE, ABILITY_RKS_SYSTEM}, {FORM_CHANGE_ITEM_HOLD, SPECIES_SILVALLY_FIGHTING, ITEM_FIGHTING_MEMORY, ABILITY_RKS_SYSTEM}, {FORM_CHANGE_ITEM_HOLD, SPECIES_SILVALLY_FLYING, ITEM_FLYING_MEMORY, ABILITY_RKS_SYSTEM}, {FORM_CHANGE_ITEM_HOLD, SPECIES_SILVALLY_POISON, ITEM_POISON_MEMORY, ABILITY_RKS_SYSTEM}, @@ -491,14 +491,14 @@ static const struct FormChange sSilvallyFormChangeTable[] = { }; static const struct FormChange sMimikyuFormChangeTable[] = { - {FORM_CHANGE_FAINT, SPECIES_MIMIKYU}, - {FORM_CHANGE_END_BATTLE, SPECIES_MIMIKYU}, + {FORM_CHANGE_FAINT, SPECIES_MIMIKYU_DISGUISED}, + {FORM_CHANGE_END_BATTLE, SPECIES_MIMIKYU_DISGUISED}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sMiniorRedFormChangeTable[] = { - {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_MINIOR, ABILITY_SHIELDS_DOWN, HP_HIGHER_THAN, 50}, - {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_MINIOR_CORE_RED, ABILITY_SHIELDS_DOWN, HP_LOWER_EQ_THAN, 50}, + {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_MINIOR_METEOR_RED, ABILITY_SHIELDS_DOWN, HP_HIGHER_THAN, 50}, + {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_MINIOR_CORE_RED, ABILITY_SHIELDS_DOWN, HP_LOWER_EQ_THAN, 50}, {FORM_CHANGE_BATTLE_SWITCH, SPECIES_MINIOR_CORE_RED}, {FORM_CHANGE_FAINT, SPECIES_MINIOR_CORE_RED}, {FORM_CHANGE_END_BATTLE, SPECIES_MINIOR_CORE_RED}, @@ -573,35 +573,35 @@ static const struct FormChange sCramorantFormChangeTable[] = { }; static const struct FormChange sEiscueFormChangeTable[] = { - {FORM_CHANGE_FAINT, SPECIES_EISCUE}, - {FORM_CHANGE_END_BATTLE, SPECIES_EISCUE}, + {FORM_CHANGE_FAINT, SPECIES_EISCUE_ICE_FACE}, + {FORM_CHANGE_END_BATTLE, SPECIES_EISCUE_ICE_FACE}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sMorpekoFormChangeTable[] = { - {FORM_CHANGE_BATTLE_TURN_END, SPECIES_MORPEKO_HANGRY, ABILITY_HUNGER_SWITCH}, - {FORM_CHANGE_BATTLE_TURN_END, SPECIES_MORPEKO , ABILITY_HUNGER_SWITCH}, - {FORM_CHANGE_BATTLE_SWITCH, SPECIES_MORPEKO}, - {FORM_CHANGE_FAINT, SPECIES_MORPEKO}, - {FORM_CHANGE_END_BATTLE, SPECIES_MORPEKO}, + {FORM_CHANGE_BATTLE_TURN_END, SPECIES_MORPEKO_HANGRY, ABILITY_HUNGER_SWITCH}, + {FORM_CHANGE_BATTLE_TURN_END, SPECIES_MORPEKO_FULL_BELLY, ABILITY_HUNGER_SWITCH}, + {FORM_CHANGE_BATTLE_SWITCH, SPECIES_MORPEKO_FULL_BELLY}, + {FORM_CHANGE_FAINT, SPECIES_MORPEKO_FULL_BELLY}, + {FORM_CHANGE_END_BATTLE, SPECIES_MORPEKO_FULL_BELLY}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sZacianFormChangeTable[] = { - {FORM_CHANGE_BEGIN_BATTLE, SPECIES_ZACIAN_CROWNED_SWORD, ITEM_RUSTED_SWORD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BLADE}, - {FORM_CHANGE_END_BATTLE, SPECIES_ZACIAN, ITEM_RUSTED_SWORD, MOVE_BEHEMOTH_BLADE, MOVE_IRON_HEAD}, + {FORM_CHANGE_BEGIN_BATTLE, SPECIES_ZACIAN_CROWNED_SWORD, ITEM_RUSTED_SWORD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BLADE}, + {FORM_CHANGE_END_BATTLE, SPECIES_ZACIAN_HERO_OF_MANY_BATTLES, ITEM_RUSTED_SWORD, MOVE_BEHEMOTH_BLADE, MOVE_IRON_HEAD}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sZamazentaFormChangeTable[] = { - {FORM_CHANGE_BEGIN_BATTLE, SPECIES_ZAMAZENTA_CROWNED_SHIELD, ITEM_RUSTED_SHIELD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BASH}, - {FORM_CHANGE_END_BATTLE, SPECIES_ZAMAZENTA, ITEM_RUSTED_SHIELD, MOVE_BEHEMOTH_BASH, MOVE_IRON_HEAD}, + {FORM_CHANGE_BEGIN_BATTLE, SPECIES_ZAMAZENTA_CROWNED_SHIELD, ITEM_RUSTED_SHIELD, MOVE_IRON_HEAD, MOVE_BEHEMOTH_BASH}, + {FORM_CHANGE_END_BATTLE, SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES, ITEM_RUSTED_SHIELD, MOVE_BEHEMOTH_BASH, MOVE_IRON_HEAD}, {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sEnamorusFormChangeTable[] = { - {FORM_CHANGE_ITEM_USE, SPECIES_ENAMORUS, ITEM_REVEAL_GLASS}, - {FORM_CHANGE_ITEM_USE, SPECIES_ENAMORUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_ITEM_USE, SPECIES_ENAMORUS_INCARNATE, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_ITEM_USE, SPECIES_ENAMORUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_CHANGE_TERMINATOR}, }; @@ -778,9 +778,9 @@ static const struct FormChange sDuraludonFormChangeTable[] = {FORM_CHANGE_TERMINATOR}, }; -static const struct FormChange sUrshifuFormChangeTable[] = +static const struct FormChange sUrshifuSingleStrikeFormChangeTable[] = { - {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_URSHIFU_GIGANTAMAX}, + {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX}, {FORM_CHANGE_TERMINATOR}, }; diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 147410323b..e615fd1b14 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -72,7 +72,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SHARPEDO] = sSharpedoFormSpeciesIdTable, [SPECIES_CAMERUPT] = sCameruptFormSpeciesIdTable, [SPECIES_ALTARIA] = sAltariaFormSpeciesIdTable, - [SPECIES_CASTFORM] = sCastformFormSpeciesIdTable, + [SPECIES_CASTFORM_NORMAL] = sCastformFormSpeciesIdTable, [SPECIES_BANETTE] = sBanetteFormSpeciesIdTable, [SPECIES_ABSOL] = sAbsolFormSpeciesIdTable, [SPECIES_GLALIE] = sGlalieFormSpeciesIdTable, @@ -83,13 +83,13 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_KYOGRE] = sKyogreFormSpeciesIdTable, [SPECIES_GROUDON] = sGroudonFormSpeciesIdTable, [SPECIES_RAYQUAZA] = sRayquazaFormSpeciesIdTable, - [SPECIES_DEOXYS] = sDeoxysFormSpeciesIdTable, + [SPECIES_DEOXYS_NORMAL] = sDeoxysFormSpeciesIdTable, #if P_GEN_4_POKEMON == TRUE - [SPECIES_BURMY] = sBurmyFormSpeciesIdTable, - [SPECIES_WORMADAM] = sWormadamFormSpeciesIdTable, - [SPECIES_CHERRIM] = sCherrimFormSpeciesIdTable, - [SPECIES_SHELLOS] = sShellosFormSpeciesIdTable, - [SPECIES_GASTRODON] = sGastrodonFormSpeciesIdTable, + [SPECIES_BURMY_PLANT_CLOAK] = sBurmyFormSpeciesIdTable, + [SPECIES_WORMADAM_PLANT_CLOAK] = sWormadamFormSpeciesIdTable, + [SPECIES_CHERRIM_OVERCAST] = sCherrimFormSpeciesIdTable, + [SPECIES_SHELLOS_WEST_SEA] = sShellosFormSpeciesIdTable, + [SPECIES_GASTRODON_WEST_SEA] = sGastrodonFormSpeciesIdTable, [SPECIES_LOPUNNY] = sLopunnyFormSpeciesIdTable, [SPECIES_GARCHOMP] = sGarchompFormSpeciesIdTable, [SPECIES_LUCARIO] = sLucarioFormSpeciesIdTable, @@ -98,80 +98,80 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ROTOM] = sRotomFormSpeciesIdTable, [SPECIES_DIALGA] = sDialgaFormSpeciesIdTable, [SPECIES_PALKIA] = sPalkiaFormSpeciesIdTable, - [SPECIES_GIRATINA] = sGiratinaFormSpeciesIdTable, - [SPECIES_SHAYMIN] = sShayminFormSpeciesIdTable, - [SPECIES_ARCEUS] = sArceusFormSpeciesIdTable, + [SPECIES_GIRATINA_ALTERED] = sGiratinaFormSpeciesIdTable, + [SPECIES_SHAYMIN_LAND] = sShayminFormSpeciesIdTable, + [SPECIES_ARCEUS_NORMAL] = sArceusFormSpeciesIdTable, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable, [SPECIES_AUDINO] = sAudinoFormSpeciesIdTable, - [SPECIES_BASCULIN] = sBasculinFormSpeciesIdTable, + [SPECIES_BASCULIN_RED_STRIPED] = sBasculinFormSpeciesIdTable, [SPECIES_LILLIGANT] = sLilligantFormSpeciesIdTable, [SPECIES_DARUMAKA] = sDarumakaFormSpeciesIdTable, - [SPECIES_DARMANITAN] = sDarmanitanFormSpeciesIdTable, + [SPECIES_DARMANITAN_STANDARD_MODE] = sDarmanitanFormSpeciesIdTable, [SPECIES_YAMASK] = sYamaskFormSpeciesIdTable, [SPECIES_ZORUA] = sZoruaFormSpeciesIdTable, [SPECIES_ZOROARK] = sZoroarkFormSpeciesIdTable, - [SPECIES_DEERLING] = sDeerlingFormSpeciesIdTable, - [SPECIES_SAWSBUCK] = sSawsbuckFormSpeciesIdTable, + [SPECIES_DEERLING_SPRING] = sDeerlingFormSpeciesIdTable, + [SPECIES_SAWSBUCK_SPRING] = sSawsbuckFormSpeciesIdTable, [SPECIES_STUNFISK] = sStunfiskFormSpeciesIdTable, [SPECIES_BRAVIARY] = sBraviaryFormSpeciesIdTable, - [SPECIES_TORNADUS] = sTornadusFormSpeciesIdTable, - [SPECIES_THUNDURUS] = sThundurusFormSpeciesIdTable, - [SPECIES_LANDORUS] = sLandorusFormSpeciesIdTable, + [SPECIES_TORNADUS_INCARNATE] = sTornadusFormSpeciesIdTable, + [SPECIES_THUNDURUS_INCARNATE] = sThundurusFormSpeciesIdTable, + [SPECIES_LANDORUS_INCARNATE] = sLandorusFormSpeciesIdTable, [SPECIES_KYUREM] = sKyuremFormSpeciesIdTable, - [SPECIES_KELDEO] = sKeldeoFormSpeciesIdTable, - [SPECIES_MELOETTA] = sMeloettaFormSpeciesIdTable, + [SPECIES_KELDEO_ORDINARY] = sKeldeoFormSpeciesIdTable, + [SPECIES_MELOETTA_ARIA] = sMeloettaFormSpeciesIdTable, [SPECIES_GENESECT] = sGenesectFormSpeciesIdTable, #endif #if P_GEN_6_POKEMON == TRUE [SPECIES_GRENINJA] = sGreninjaFormSpeciesIdTable, - [SPECIES_VIVILLON] = sVivillonFormSpeciesIdTable, - [SPECIES_FLABEBE] = sFlabebeFormSpeciesIdTable, + [SPECIES_VIVILLON_ICY_SNOW] = sVivillonFormSpeciesIdTable, + [SPECIES_FLABEBE_RED_FLOWER] = sFlabebeFormSpeciesIdTable, [SPECIES_FLOETTE] = sFloetteFormSpeciesIdTable, [SPECIES_FLORGES] = sFlorgesFormSpeciesIdTable, - [SPECIES_FURFROU] = sFurfrouFormSpeciesIdTable, - [SPECIES_MEOWSTIC] = sMeowsticFormSpeciesIdTable, - [SPECIES_AEGISLASH] = sAegislashFormSpeciesIdTable, + [SPECIES_FURFROU_NATURAL] = sFurfrouFormSpeciesIdTable, + [SPECIES_MEOWSTIC_MALE] = sMeowsticFormSpeciesIdTable, + [SPECIES_AEGISLASH_SHIELD] = sAegislashFormSpeciesIdTable, [SPECIES_SLIGGOO] = sSliggooFormSpeciesIdTable, [SPECIES_GOODRA] = sGoodraFormSpeciesIdTable, - [SPECIES_PUMPKABOO] = sPumpkabooFormSpeciesIdTable, - [SPECIES_GOURGEIST] = sGourgeistFormSpeciesIdTable, + [SPECIES_PUMPKABOO_AVERAGE] = sPumpkabooFormSpeciesIdTable, + [SPECIES_GOURGEIST_AVERAGE] = sGourgeistFormSpeciesIdTable, [SPECIES_AVALUGG] = sAvaluggFormSpeciesIdTable, - [SPECIES_XERNEAS] = sXerneasFormSpeciesIdTable, - [SPECIES_ZYGARDE] = sZygardeFormSpeciesIdTable, + [SPECIES_XERNEAS_NEUTRAL] = sXerneasFormSpeciesIdTable, + [SPECIES_ZYGARDE_50_AURA_BREAK] = sZygardeFormSpeciesIdTable, [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable, - [SPECIES_HOOPA] = sHoopaFormSpeciesIdTable, + [SPECIES_HOOPA_CONFINED] = sHoopaFormSpeciesIdTable, #endif #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable, - [SPECIES_ORICORIO] = sOricorioFormSpeciesIdTable, + [SPECIES_ORICORIO_BAILE] = sOricorioFormSpeciesIdTable, [SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable, - [SPECIES_LYCANROC] = sLycanrocFormSpeciesIdTable, - [SPECIES_WISHIWASHI] = sWishiwashiFormSpeciesIdTable, - [SPECIES_SILVALLY] = sSilvallyFormSpeciesIdTable, - [SPECIES_MINIOR] = sMiniorFormSpeciesIdTable, - [SPECIES_MIMIKYU] = sMimikyuFormSpeciesIdTable, + [SPECIES_LYCANROC_MIDDAY] = sLycanrocFormSpeciesIdTable, + [SPECIES_WISHIWASHI_SOLO] = sWishiwashiFormSpeciesIdTable, + [SPECIES_SILVALLY_NORMAL] = sSilvallyFormSpeciesIdTable, + [SPECIES_MINIOR_METEOR_RED] = sMiniorFormSpeciesIdTable, + [SPECIES_MIMIKYU_DISGUISED] = sMimikyuFormSpeciesIdTable, [SPECIES_NECROZMA] = sNecrozmaFormSpeciesIdTable, [SPECIES_MAGEARNA] = sMagearnaFormSpeciesIdTable, #endif #if P_GEN_8_POKEMON == TRUE [SPECIES_CRAMORANT] = sCramorantFormSpeciesIdTable, - [SPECIES_TOXTRICITY] = sToxtricityFormSpeciesIdTable, - [SPECIES_SINISTEA] = sSinisteaFormSpeciesIdTable, - [SPECIES_POLTEAGEIST] = sPolteageistFormSpeciesIdTable, - [SPECIES_ALCREMIE] = sAlcremieFormSpeciesIdTable, - [SPECIES_EISCUE] = sEiscueFormSpeciesIdTable, - [SPECIES_INDEEDEE] = sIndeedeeFormSpeciesIdTable, - [SPECIES_MORPEKO] = sMorpekoFormSpeciesIdTable, - [SPECIES_ZACIAN] = sZacianFormSpeciesIdTable, - [SPECIES_ZAMAZENTA] = sZamazentaFormSpeciesIdTable, + [SPECIES_TOXTRICITY_AMPED] = sToxtricityFormSpeciesIdTable, + [SPECIES_SINISTEA_PHONY] = sSinisteaFormSpeciesIdTable, + [SPECIES_POLTEAGEIST_PHONY] = sPolteageistFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = sAlcremieFormSpeciesIdTable, + [SPECIES_EISCUE_ICE_FACE] = sEiscueFormSpeciesIdTable, + [SPECIES_INDEEDEE_MALE] = sIndeedeeFormSpeciesIdTable, + [SPECIES_MORPEKO_FULL_BELLY] = sMorpekoFormSpeciesIdTable, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sZacianFormSpeciesIdTable, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaFormSpeciesIdTable, [SPECIES_ETERNATUS] = sEternatusFormSpeciesIdTable, - [SPECIES_URSHIFU] = sUrshifuFormSpeciesIdTable, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = sUrshifuFormSpeciesIdTable, [SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable, [SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable, - [SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable, - [SPECIES_BASCULEGION] = sBasculegionFormSpeciesIdTable, + [SPECIES_ENAMORUS_INCARNATE] = sEnamorusFormSpeciesIdTable, + [SPECIES_BASCULEGION_MALE] = sBasculegionFormSpeciesIdTable, #endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, @@ -268,7 +268,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_LINOONE_GALARIAN] = sLinooneFormSpeciesIdTable, #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = sDarumakaFormSpeciesIdTable, - [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanFormSpeciesIdTable, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = sDarmanitanFormSpeciesIdTable, [SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable, [SPECIES_STUNFISK_GALARIAN] = sStunfiskFormSpeciesIdTable, #endif @@ -400,7 +400,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinFormSpeciesIdTable, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanFormSpeciesIdTable, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanFormSpeciesIdTable, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanFormSpeciesIdTable, // Deerling [SPECIES_DEERLING_SUMMER] = sDeerlingFormSpeciesIdTable, [SPECIES_DEERLING_AUTUMN] = sDeerlingFormSpeciesIdTable, @@ -491,7 +491,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = // Xerneas [SPECIES_XERNEAS_ACTIVE] = sXerneasFormSpeciesIdTable, // Zygarde - [SPECIES_ZYGARDE_10] = sZygardeFormSpeciesIdTable, + [SPECIES_ZYGARDE_10_AURA_BREAK] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE_COMPLETE] = sZygardeFormSpeciesIdTable, @@ -562,14 +562,14 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = sPolteageistFormSpeciesIdTable, // Alcremie - [SPECIES_ALCREMIE_RUBY_CREAM] = sAlcremieFormSpeciesIdTable, - [SPECIES_ALCREMIE_MATCHA_CREAM] = sAlcremieFormSpeciesIdTable, - [SPECIES_ALCREMIE_MINT_CREAM] = sAlcremieFormSpeciesIdTable, - [SPECIES_ALCREMIE_LEMON_CREAM] = sAlcremieFormSpeciesIdTable, - [SPECIES_ALCREMIE_SALTED_CREAM] = sAlcremieFormSpeciesIdTable, - [SPECIES_ALCREMIE_RUBY_SWIRL] = sAlcremieFormSpeciesIdTable, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = sAlcremieFormSpeciesIdTable, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = sAlcremieFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAlcremieFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAlcremieFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAlcremieFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = sAlcremieFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = sAlcremieFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAlcremieFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAlcremieFormSpeciesIdTable, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAlcremieFormSpeciesIdTable, // Eiscue [SPECIES_EISCUE_NOICE_FACE] = sEiscueFormSpeciesIdTable, // Indeedee @@ -626,7 +626,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ALCREMIE_GIGANTAMAX] = sAlcremieFormSpeciesIdTable, [SPECIES_COPPERAJAH_GIGANTAMAX] = sCopperajahFormSpeciesIdTable, [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonFormSpeciesIdTable, - [SPECIES_URSHIFU_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, #endif }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index f1054b1d68..a1d5314884 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -516,7 +516,7 @@ static const u16 sAltariaFormSpeciesIdTable[] = { }; static const u16 sCastformFormSpeciesIdTable[] = { - SPECIES_CASTFORM, + SPECIES_CASTFORM_NORMAL, SPECIES_CASTFORM_SUNNY, SPECIES_CASTFORM_RAINY, SPECIES_CASTFORM_SNOWY, @@ -584,7 +584,7 @@ static const u16 sRayquazaFormSpeciesIdTable[] = { }; static const u16 sDeoxysFormSpeciesIdTable[] = { - SPECIES_DEOXYS, + SPECIES_DEOXYS_NORMAL, SPECIES_DEOXYS_ATTACK, SPECIES_DEOXYS_DEFENSE, SPECIES_DEOXYS_SPEED, @@ -593,33 +593,33 @@ static const u16 sDeoxysFormSpeciesIdTable[] = { #if P_GEN_4_POKEMON == TRUE static const u16 sBurmyFormSpeciesIdTable[] = { - SPECIES_BURMY, + SPECIES_BURMY_PLANT_CLOAK, SPECIES_BURMY_SANDY_CLOAK, SPECIES_BURMY_TRASH_CLOAK, FORM_SPECIES_END, }; static const u16 sWormadamFormSpeciesIdTable[] = { - SPECIES_WORMADAM, + SPECIES_WORMADAM_PLANT_CLOAK, SPECIES_WORMADAM_SANDY_CLOAK, SPECIES_WORMADAM_TRASH_CLOAK, FORM_SPECIES_END, }; static const u16 sCherrimFormSpeciesIdTable[] = { - SPECIES_CHERRIM, + SPECIES_CHERRIM_OVERCAST, SPECIES_CHERRIM_SUNSHINE, FORM_SPECIES_END, }; static const u16 sShellosFormSpeciesIdTable[] = { - SPECIES_SHELLOS, + SPECIES_SHELLOS_WEST_SEA, SPECIES_SHELLOS_EAST_SEA, FORM_SPECIES_END, }; static const u16 sGastrodonFormSpeciesIdTable[] = { - SPECIES_GASTRODON, + SPECIES_GASTRODON_WEST_SEA, SPECIES_GASTRODON_EAST_SEA, FORM_SPECIES_END, }; @@ -677,19 +677,19 @@ static const u16 sPalkiaFormSpeciesIdTable[] = { }; static const u16 sGiratinaFormSpeciesIdTable[] = { - SPECIES_GIRATINA, + SPECIES_GIRATINA_ALTERED, SPECIES_GIRATINA_ORIGIN, FORM_SPECIES_END, }; static const u16 sShayminFormSpeciesIdTable[] = { - SPECIES_SHAYMIN, + SPECIES_SHAYMIN_LAND, SPECIES_SHAYMIN_SKY, FORM_SPECIES_END, }; static const u16 sArceusFormSpeciesIdTable[] = { - SPECIES_ARCEUS, + SPECIES_ARCEUS_NORMAL, SPECIES_ARCEUS_FIGHTING, SPECIES_ARCEUS_FLYING, SPECIES_ARCEUS_POISON, @@ -725,7 +725,7 @@ static const u16 sAudinoFormSpeciesIdTable[] = { }; static const u16 sBasculinFormSpeciesIdTable[] = { - SPECIES_BASCULIN, + SPECIES_BASCULIN_RED_STRIPED, SPECIES_BASCULIN_BLUE_STRIPED, SPECIES_BASCULIN_WHITE_STRIPED, FORM_SPECIES_END, @@ -744,10 +744,10 @@ static const u16 sDarumakaFormSpeciesIdTable[] = { }; static const u16 sDarmanitanFormSpeciesIdTable[] = { - SPECIES_DARMANITAN, + SPECIES_DARMANITAN_STANDARD_MODE, SPECIES_DARMANITAN_ZEN_MODE, - SPECIES_DARMANITAN_GALARIAN, - SPECIES_DARMANITAN_ZEN_MODE_GALARIAN, + SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE, + SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, FORM_SPECIES_END, }; @@ -776,7 +776,7 @@ static const u16 sGarbodorFormSpeciesIdTable[] = { }; static const u16 sDeerlingFormSpeciesIdTable[] = { - SPECIES_DEERLING, + SPECIES_DEERLING_SPRING, SPECIES_DEERLING_SUMMER, SPECIES_DEERLING_AUTUMN, SPECIES_DEERLING_WINTER, @@ -784,7 +784,7 @@ static const u16 sDeerlingFormSpeciesIdTable[] = { }; static const u16 sSawsbuckFormSpeciesIdTable[] = { - SPECIES_SAWSBUCK, + SPECIES_SAWSBUCK_SPRING, SPECIES_SAWSBUCK_SUMMER, SPECIES_SAWSBUCK_AUTUMN, SPECIES_SAWSBUCK_WINTER, @@ -804,19 +804,19 @@ static const u16 sBraviaryFormSpeciesIdTable[] = { }; static const u16 sTornadusFormSpeciesIdTable[] = { - SPECIES_TORNADUS, + SPECIES_TORNADUS_INCARNATE, SPECIES_TORNADUS_THERIAN, FORM_SPECIES_END, }; static const u16 sThundurusFormSpeciesIdTable[] = { - SPECIES_THUNDURUS, + SPECIES_THUNDURUS_INCARNATE, SPECIES_THUNDURUS_THERIAN, FORM_SPECIES_END, }; static const u16 sLandorusFormSpeciesIdTable[] = { - SPECIES_LANDORUS, + SPECIES_LANDORUS_INCARNATE, SPECIES_LANDORUS_THERIAN, FORM_SPECIES_END, }; @@ -829,13 +829,13 @@ static const u16 sKyuremFormSpeciesIdTable[] = { }; static const u16 sKeldeoFormSpeciesIdTable[] = { - SPECIES_KELDEO, + SPECIES_KELDEO_ORDINARY, SPECIES_KELDEO_RESOLUTE, FORM_SPECIES_END, }; static const u16 sMeloettaFormSpeciesIdTable[] = { - SPECIES_MELOETTA, + SPECIES_MELOETTA_ARIA, SPECIES_MELOETTA_PIROUETTE, FORM_SPECIES_END, }; @@ -859,7 +859,7 @@ static const u16 sGreninjaFormSpeciesIdTable[] = { }; static const u16 sVivillonFormSpeciesIdTable[] = { - SPECIES_VIVILLON, + SPECIES_VIVILLON_ICY_SNOW, SPECIES_VIVILLON_POLAR, SPECIES_VIVILLON_TUNDRA, SPECIES_VIVILLON_CONTINENTAL, @@ -883,7 +883,7 @@ static const u16 sVivillonFormSpeciesIdTable[] = { }; static const u16 sFlabebeFormSpeciesIdTable[] = { - SPECIES_FLABEBE, + SPECIES_FLABEBE_RED_FLOWER, SPECIES_FLABEBE_YELLOW_FLOWER, SPECIES_FLABEBE_ORANGE_FLOWER, SPECIES_FLABEBE_BLUE_FLOWER, @@ -892,7 +892,7 @@ static const u16 sFlabebeFormSpeciesIdTable[] = { }; static const u16 sFloetteFormSpeciesIdTable[] = { - SPECIES_FLOETTE, + SPECIES_FLOETTE_RED_FLOWER, SPECIES_FLOETTE_YELLOW_FLOWER, SPECIES_FLOETTE_ORANGE_FLOWER, SPECIES_FLOETTE_BLUE_FLOWER, @@ -902,7 +902,7 @@ static const u16 sFloetteFormSpeciesIdTable[] = { }; static const u16 sFlorgesFormSpeciesIdTable[] = { - SPECIES_FLORGES, + SPECIES_FLORGES_RED_FLOWER, SPECIES_FLORGES_YELLOW_FLOWER, SPECIES_FLORGES_ORANGE_FLOWER, SPECIES_FLORGES_BLUE_FLOWER, @@ -911,7 +911,7 @@ static const u16 sFlorgesFormSpeciesIdTable[] = { }; static const u16 sFurfrouFormSpeciesIdTable[] = { - SPECIES_FURFROU, + SPECIES_FURFROU_NATURAL, SPECIES_FURFROU_HEART_TRIM, SPECIES_FURFROU_STAR_TRIM, SPECIES_FURFROU_DIAMOND_TRIM, @@ -925,13 +925,13 @@ static const u16 sFurfrouFormSpeciesIdTable[] = { }; static const u16 sMeowsticFormSpeciesIdTable[] = { - SPECIES_MEOWSTIC, + SPECIES_MEOWSTIC_MALE, SPECIES_MEOWSTIC_FEMALE, FORM_SPECIES_END, }; static const u16 sAegislashFormSpeciesIdTable[] = { - SPECIES_AEGISLASH, + SPECIES_AEGISLASH_SHIELD, SPECIES_AEGISLASH_BLADE, FORM_SPECIES_END, }; @@ -949,7 +949,7 @@ static const u16 sGoodraFormSpeciesIdTable[] = { }; static const u16 sPumpkabooFormSpeciesIdTable[] = { - SPECIES_PUMPKABOO, + SPECIES_PUMPKABOO_AVERAGE, SPECIES_PUMPKABOO_SMALL, SPECIES_PUMPKABOO_LARGE, SPECIES_PUMPKABOO_SUPER, @@ -957,7 +957,7 @@ static const u16 sPumpkabooFormSpeciesIdTable[] = { }; static const u16 sGourgeistFormSpeciesIdTable[] = { - SPECIES_GOURGEIST, + SPECIES_GOURGEIST_AVERAGE, SPECIES_GOURGEIST_SMALL, SPECIES_GOURGEIST_LARGE, SPECIES_GOURGEIST_SUPER, @@ -971,14 +971,14 @@ static const u16 sAvaluggFormSpeciesIdTable[] = { }; static const u16 sXerneasFormSpeciesIdTable[] = { - SPECIES_XERNEAS, + SPECIES_XERNEAS_NEUTRAL, SPECIES_XERNEAS_ACTIVE, FORM_SPECIES_END, }; static const u16 sZygardeFormSpeciesIdTable[] = { - SPECIES_ZYGARDE, - SPECIES_ZYGARDE_10, + SPECIES_ZYGARDE_50_AURA_BREAK, + SPECIES_ZYGARDE_10_AURA_BREAK, SPECIES_ZYGARDE_10_POWER_CONSTRUCT, SPECIES_ZYGARDE_50_POWER_CONSTRUCT, SPECIES_ZYGARDE_COMPLETE, @@ -992,7 +992,7 @@ static const u16 sDiancieFormSpeciesIdTable[] = { }; static const u16 sHoopaFormSpeciesIdTable[] = { - SPECIES_HOOPA, + SPECIES_HOOPA_CONFINED, SPECIES_HOOPA_UNBOUND, FORM_SPECIES_END, }; @@ -1006,7 +1006,7 @@ static const u16 sDecidueyeFormSpeciesIdTable[] = { }; static const u16 sOricorioFormSpeciesIdTable[] = { - SPECIES_ORICORIO, + SPECIES_ORICORIO_BAILE, SPECIES_ORICORIO_POM_POM, SPECIES_ORICORIO_PAU, SPECIES_ORICORIO_SENSU, @@ -1020,20 +1020,20 @@ static const u16 sRockruffFormSpeciesIdTable[] = { }; static const u16 sLycanrocFormSpeciesIdTable[] = { - SPECIES_LYCANROC, + SPECIES_LYCANROC_MIDDAY, SPECIES_LYCANROC_MIDNIGHT, SPECIES_LYCANROC_DUSK, FORM_SPECIES_END, }; static const u16 sWishiwashiFormSpeciesIdTable[] = { - SPECIES_WISHIWASHI, + SPECIES_WISHIWASHI_SOLO, SPECIES_WISHIWASHI_SCHOOL, FORM_SPECIES_END, }; static const u16 sSilvallyFormSpeciesIdTable[] = { - SPECIES_SILVALLY, + SPECIES_SILVALLY_NORMAL, SPECIES_SILVALLY_FIGHTING, SPECIES_SILVALLY_FLYING, SPECIES_SILVALLY_POISON, @@ -1055,7 +1055,7 @@ static const u16 sSilvallyFormSpeciesIdTable[] = { }; static const u16 sMiniorFormSpeciesIdTable[] = { - SPECIES_MINIOR, + SPECIES_MINIOR_METEOR_RED, SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_METEOR_GREEN, @@ -1073,7 +1073,7 @@ static const u16 sMiniorFormSpeciesIdTable[] = { }; static const u16 sMimikyuFormSpeciesIdTable[] = { - SPECIES_MIMIKYU, + SPECIES_MIMIKYU_DISGUISED, SPECIES_MIMIKYU_BUSTED, FORM_SPECIES_END, }; @@ -1169,7 +1169,7 @@ static const u16 sCramorantFormSpeciesIdTable[] = { }; static const u16 sToxtricityFormSpeciesIdTable[] = { - SPECIES_TOXTRICITY, + SPECIES_TOXTRICITY_AMPED, SPECIES_TOXTRICITY_LOW_KEY, SPECIES_TOXTRICITY_AMPED_GIGANTAMAX, SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX, @@ -1189,13 +1189,13 @@ static const u16 sHattereneFormSpeciesIdTable[] = { }; static const u16 sSinisteaFormSpeciesIdTable[] = { - SPECIES_SINISTEA, + SPECIES_SINISTEA_PHONY, SPECIES_SINISTEA_ANTIQUE, FORM_SPECIES_END, }; static const u16 sPolteageistFormSpeciesIdTable[] = { - SPECIES_POLTEAGEIST, + SPECIES_POLTEAGEIST_PHONY, SPECIES_POLTEAGEIST_ANTIQUE, FORM_SPECIES_END, }; @@ -1207,32 +1207,32 @@ static const u16 sGrimmsnarlFormSpeciesIdTable[] = { }; static const u16 sAlcremieFormSpeciesIdTable[] = { - SPECIES_ALCREMIE, - SPECIES_ALCREMIE_RUBY_CREAM, - SPECIES_ALCREMIE_MATCHA_CREAM, - SPECIES_ALCREMIE_MINT_CREAM, - SPECIES_ALCREMIE_LEMON_CREAM, - SPECIES_ALCREMIE_SALTED_CREAM, - SPECIES_ALCREMIE_RUBY_SWIRL, - SPECIES_ALCREMIE_CARAMEL_SWIRL, - SPECIES_ALCREMIE_RAINBOW_SWIRL, + SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM, + SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM, + SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM, + SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM, + SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM, + SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM, + SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL, + SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL, + SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL, FORM_SPECIES_END, }; static const u16 sEiscueFormSpeciesIdTable[] = { - SPECIES_EISCUE, + SPECIES_EISCUE_ICE_FACE, SPECIES_EISCUE_NOICE_FACE, FORM_SPECIES_END, }; static const u16 sIndeedeeFormSpeciesIdTable[] = { - SPECIES_INDEEDEE, + SPECIES_INDEEDEE_MALE, SPECIES_INDEEDEE_FEMALE, FORM_SPECIES_END, }; static const u16 sMorpekoFormSpeciesIdTable[] = { - SPECIES_MORPEKO, + SPECIES_MORPEKO_FULL_BELLY, SPECIES_MORPEKO_HANGRY, FORM_SPECIES_END, }; @@ -1250,13 +1250,13 @@ static const u16 sDuraludonFormSpeciesIdTable[] = { }; static const u16 sZacianFormSpeciesIdTable[] = { - SPECIES_ZACIAN, + SPECIES_ZACIAN_HERO_OF_MANY_BATTLES, SPECIES_ZACIAN_CROWNED_SWORD, FORM_SPECIES_END, }; static const u16 sZamazentaFormSpeciesIdTable[] = { - SPECIES_ZAMAZENTA, + SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES, SPECIES_ZAMAZENTA_CROWNED_SHIELD, FORM_SPECIES_END, }; @@ -1268,9 +1268,9 @@ static const u16 sEternatusFormSpeciesIdTable[] = { }; static const u16 sUrshifuFormSpeciesIdTable[] = { - SPECIES_URSHIFU, + SPECIES_URSHIFU_SINGLE_STRIKE_STYLE, SPECIES_URSHIFU_RAPID_STRIKE_STYLE, - SPECIES_URSHIFU_GIGANTAMAX, + SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX, SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, FORM_SPECIES_END, }; @@ -1289,13 +1289,13 @@ static const u16 sCalyrexFormSpeciesIdTable[] = { }; static const u16 sEnamorusFormSpeciesIdTable[] = { - SPECIES_ENAMORUS, + SPECIES_ENAMORUS_INCARNATE, SPECIES_ENAMORUS_THERIAN, FORM_SPECIES_END, }; static const u16 sBasculegionFormSpeciesIdTable[] = { - SPECIES_BASCULEGION, + SPECIES_BASCULEGION_MALE, SPECIES_BASCULEGION_FEMALE, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 6fad71aeae..3a6dc86cc8 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -360,7 +360,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ARON] = sAronLevelUpLearnset, [SPECIES_LAIRON] = sLaironLevelUpLearnset, [SPECIES_AGGRON] = sAggronLevelUpLearnset, - [SPECIES_CASTFORM] = sCastformLevelUpLearnset, + [SPECIES_CASTFORM_NORMAL] = sCastformLevelUpLearnset, [SPECIES_VOLBEAT] = sVolbeatLevelUpLearnset, [SPECIES_ILLUMISE] = sIllumiseLevelUpLearnset, [SPECIES_LILEEP] = sLileepLevelUpLearnset, @@ -385,7 +385,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_LATIAS] = sLatiasLevelUpLearnset, [SPECIES_LATIOS] = sLatiosLevelUpLearnset, [SPECIES_JIRACHI] = sJirachiLevelUpLearnset, - [SPECIES_DEOXYS] = sDeoxysLevelUpLearnset, + [SPECIES_DEOXYS_NORMAL] = sDeoxysNormalLevelUpLearnset, [SPECIES_CHIMECHO] = sChimechoLevelUpLearnset, #if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = sTurtwigLevelUpLearnset, @@ -413,8 +413,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_RAMPARDOS] = sRampardosLevelUpLearnset, [SPECIES_SHIELDON] = sShieldonLevelUpLearnset, [SPECIES_BASTIODON] = sBastiodonLevelUpLearnset, - [SPECIES_BURMY] = sBurmyLevelUpLearnset, - [SPECIES_WORMADAM] = sWormadamLevelUpLearnset, + [SPECIES_BURMY_PLANT_CLOAK] = sBurmyLevelUpLearnset, + [SPECIES_WORMADAM_PLANT_CLOAK] = sWormadamPlantCloakLevelUpLearnset, [SPECIES_MOTHIM] = sMothimLevelUpLearnset, [SPECIES_COMBEE] = sCombeeLevelUpLearnset, [SPECIES_VESPIQUEN] = sVespiquenLevelUpLearnset, @@ -422,9 +422,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BUIZEL] = sBuizelLevelUpLearnset, [SPECIES_FLOATZEL] = sFloatzelLevelUpLearnset, [SPECIES_CHERUBI] = sCherubiLevelUpLearnset, - [SPECIES_CHERRIM] = sCherrimLevelUpLearnset, - [SPECIES_SHELLOS] = sShellosLevelUpLearnset, - [SPECIES_GASTRODON] = sGastrodonLevelUpLearnset, + [SPECIES_CHERRIM_OVERCAST] = sCherrimLevelUpLearnset, + [SPECIES_SHELLOS_WEST_SEA] = sShellosLevelUpLearnset, + [SPECIES_GASTRODON_WEST_SEA] = sGastrodonLevelUpLearnset, [SPECIES_AMBIPOM] = sAmbipomLevelUpLearnset, [SPECIES_DRIFLOON] = sDrifloonLevelUpLearnset, [SPECIES_DRIFBLIM] = sDrifblimLevelUpLearnset, @@ -488,13 +488,13 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PALKIA] = sPalkiaLevelUpLearnset, [SPECIES_HEATRAN] = sHeatranLevelUpLearnset, [SPECIES_REGIGIGAS] = sRegigigasLevelUpLearnset, - [SPECIES_GIRATINA] = sGiratinaLevelUpLearnset, + [SPECIES_GIRATINA_ALTERED] = sGiratinaLevelUpLearnset, [SPECIES_CRESSELIA] = sCresseliaLevelUpLearnset, [SPECIES_PHIONE] = sPhioneLevelUpLearnset, [SPECIES_MANAPHY] = sManaphyLevelUpLearnset, [SPECIES_DARKRAI] = sDarkraiLevelUpLearnset, - [SPECIES_SHAYMIN] = sShayminLevelUpLearnset, - [SPECIES_ARCEUS] = sArceusLevelUpLearnset, + [SPECIES_SHAYMIN_LAND] = sShayminLandLevelUpLearnset, + [SPECIES_ARCEUS_NORMAL] = sArceusLevelUpLearnset, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = sVictiniLevelUpLearnset, @@ -553,12 +553,12 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_WHIMSICOTT] = sWhimsicottLevelUpLearnset, [SPECIES_PETILIL] = sPetililLevelUpLearnset, [SPECIES_LILLIGANT] = sLilligantLevelUpLearnset, - [SPECIES_BASCULIN] = sBasculinLevelUpLearnset, + [SPECIES_BASCULIN_RED_STRIPED] = sBasculinLevelUpLearnset, [SPECIES_SANDILE] = sSandileLevelUpLearnset, [SPECIES_KROKOROK] = sKrokorokLevelUpLearnset, [SPECIES_KROOKODILE] = sKrookodileLevelUpLearnset, [SPECIES_DARUMAKA] = sDarumakaLevelUpLearnset, - [SPECIES_DARMANITAN] = sDarmanitanLevelUpLearnset, + [SPECIES_DARMANITAN_STANDARD_MODE] = sDarmanitanLevelUpLearnset, [SPECIES_MARACTUS] = sMaractusLevelUpLearnset, [SPECIES_DWEBBLE] = sDwebbleLevelUpLearnset, [SPECIES_CRUSTLE] = sCrustleLevelUpLearnset, @@ -588,8 +588,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_VANILLITE] = sVanilliteLevelUpLearnset, [SPECIES_VANILLISH] = sVanillishLevelUpLearnset, [SPECIES_VANILLUXE] = sVanilluxeLevelUpLearnset, - [SPECIES_DEERLING] = sDeerlingLevelUpLearnset, - [SPECIES_SAWSBUCK] = sSawsbuckLevelUpLearnset, + [SPECIES_DEERLING_SPRING] = sDeerlingLevelUpLearnset, + [SPECIES_SAWSBUCK_SPRING] = sSawsbuckLevelUpLearnset, [SPECIES_EMOLGA] = sEmolgaLevelUpLearnset, [SPECIES_KARRABLAST] = sKarrablastLevelUpLearnset, [SPECIES_ESCAVALIER] = sEscavalierLevelUpLearnset, @@ -644,14 +644,14 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_COBALION] = sCobalionLevelUpLearnset, [SPECIES_TERRAKION] = sTerrakionLevelUpLearnset, [SPECIES_VIRIZION] = sVirizionLevelUpLearnset, - [SPECIES_TORNADUS] = sTornadusLevelUpLearnset, - [SPECIES_THUNDURUS] = sThundurusLevelUpLearnset, + [SPECIES_TORNADUS_INCARNATE] = sTornadusLevelUpLearnset, + [SPECIES_THUNDURUS_INCARNATE] = sThundurusLevelUpLearnset, [SPECIES_RESHIRAM] = sReshiramLevelUpLearnset, [SPECIES_ZEKROM] = sZekromLevelUpLearnset, - [SPECIES_LANDORUS] = sLandorusLevelUpLearnset, + [SPECIES_LANDORUS_INCARNATE] = sLandorusLevelUpLearnset, [SPECIES_KYUREM] = sKyuremLevelUpLearnset, - [SPECIES_KELDEO] = sKeldeoLevelUpLearnset, - [SPECIES_MELOETTA] = sMeloettaLevelUpLearnset, + [SPECIES_KELDEO_ORDINARY] = sKeldeoLevelUpLearnset, + [SPECIES_MELOETTA_ARIA] = sMeloettaLevelUpLearnset, [SPECIES_GENESECT] = sGenesectLevelUpLearnset, #endif #if P_GEN_6_POKEMON == TRUE @@ -671,22 +671,22 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_TALONFLAME] = sTalonflameLevelUpLearnset, [SPECIES_SCATTERBUG] = sScatterbugLevelUpLearnset, [SPECIES_SPEWPA] = sSpewpaLevelUpLearnset, - [SPECIES_VIVILLON] = sVivillonLevelUpLearnset, + [SPECIES_VIVILLON_ICY_SNOW] = sVivillonLevelUpLearnset, [SPECIES_LITLEO] = sLitleoLevelUpLearnset, [SPECIES_PYROAR] = sPyroarLevelUpLearnset, - [SPECIES_FLABEBE] = sFlabebeLevelUpLearnset, - [SPECIES_FLOETTE] = sFloetteLevelUpLearnset, - [SPECIES_FLORGES] = sFlorgesLevelUpLearnset, + [SPECIES_FLABEBE_RED_FLOWER] = sFlabebeLevelUpLearnset, + [SPECIES_FLOETTE_RED_FLOWER] = sFloetteLevelUpLearnset, + [SPECIES_FLORGES_RED_FLOWER] = sFlorgesLevelUpLearnset, [SPECIES_SKIDDO] = sSkiddoLevelUpLearnset, [SPECIES_GOGOAT] = sGogoatLevelUpLearnset, [SPECIES_PANCHAM] = sPanchamLevelUpLearnset, [SPECIES_PANGORO] = sPangoroLevelUpLearnset, - [SPECIES_FURFROU] = sFurfrouLevelUpLearnset, + [SPECIES_FURFROU_NATURAL] = sFurfrouLevelUpLearnset, [SPECIES_ESPURR] = sEspurrLevelUpLearnset, - [SPECIES_MEOWSTIC] = sMeowsticLevelUpLearnset, + [SPECIES_MEOWSTIC_MALE] = sMeowsticMaleLevelUpLearnset, [SPECIES_HONEDGE] = sHonedgeLevelUpLearnset, [SPECIES_DOUBLADE] = sDoubladeLevelUpLearnset, - [SPECIES_AEGISLASH] = sAegislashLevelUpLearnset, + [SPECIES_AEGISLASH_SHIELD] = sAegislashLevelUpLearnset, [SPECIES_SPRITZEE] = sSpritzeeLevelUpLearnset, [SPECIES_AROMATISSE] = sAromatisseLevelUpLearnset, [SPECIES_SWIRLIX] = sSwirlixLevelUpLearnset, @@ -715,17 +715,17 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_KLEFKI] = sKlefkiLevelUpLearnset, [SPECIES_PHANTUMP] = sPhantumpLevelUpLearnset, [SPECIES_TREVENANT] = sTrevenantLevelUpLearnset, - [SPECIES_PUMPKABOO] = sPumpkabooLevelUpLearnset, - [SPECIES_GOURGEIST] = sGourgeistLevelUpLearnset, + [SPECIES_PUMPKABOO_AVERAGE] = sPumpkabooLevelUpLearnset, + [SPECIES_GOURGEIST_AVERAGE] = sGourgeistLevelUpLearnset, [SPECIES_BERGMITE] = sBergmiteLevelUpLearnset, [SPECIES_AVALUGG] = sAvaluggLevelUpLearnset, [SPECIES_NOIBAT] = sNoibatLevelUpLearnset, [SPECIES_NOIVERN] = sNoivernLevelUpLearnset, - [SPECIES_XERNEAS] = sXerneasLevelUpLearnset, + [SPECIES_XERNEAS_NEUTRAL] = sXerneasLevelUpLearnset, [SPECIES_YVELTAL] = sYveltalLevelUpLearnset, - [SPECIES_ZYGARDE] = sZygardeLevelUpLearnset, + [SPECIES_ZYGARDE_50_AURA_BREAK] = sZygardeLevelUpLearnset, [SPECIES_DIANCIE] = sDiancieLevelUpLearnset, - [SPECIES_HOOPA] = sHoopaLevelUpLearnset, + [SPECIES_HOOPA_CONFINED] = sHoopaConfinedLevelUpLearnset, [SPECIES_VOLCANION] = sVolcanionLevelUpLearnset, #endif #if P_GEN_7_POKEMON == TRUE @@ -748,12 +748,12 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_VIKAVOLT] = sVikavoltLevelUpLearnset, [SPECIES_CRABRAWLER] = sCrabrawlerLevelUpLearnset, [SPECIES_CRABOMINABLE] = sCrabominableLevelUpLearnset, - [SPECIES_ORICORIO] = sOricorioLevelUpLearnset, + [SPECIES_ORICORIO_BAILE] = sOricorioLevelUpLearnset, [SPECIES_CUTIEFLY] = sCutieflyLevelUpLearnset, [SPECIES_RIBOMBEE] = sRibombeeLevelUpLearnset, [SPECIES_ROCKRUFF] = sRockruffLevelUpLearnset, - [SPECIES_LYCANROC] = sLycanrocLevelUpLearnset, - [SPECIES_WISHIWASHI] = sWishiwashiLevelUpLearnset, + [SPECIES_LYCANROC_MIDDAY] = sLycanrocMiddayLevelUpLearnset, + [SPECIES_WISHIWASHI_SOLO] = sWishiwashiLevelUpLearnset, [SPECIES_MAREANIE] = sMareanieLevelUpLearnset, [SPECIES_TOXAPEX] = sToxapexLevelUpLearnset, [SPECIES_MUDBRAY] = sMudbrayLevelUpLearnset, @@ -780,12 +780,12 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PALOSSAND] = sPalossandLevelUpLearnset, [SPECIES_PYUKUMUKU] = sPyukumukuLevelUpLearnset, [SPECIES_TYPE_NULL] = sTypeNullLevelUpLearnset, - [SPECIES_SILVALLY] = sSilvallyLevelUpLearnset, - [SPECIES_MINIOR] = sMiniorLevelUpLearnset, + [SPECIES_SILVALLY_NORMAL] = sSilvallyLevelUpLearnset, + [SPECIES_MINIOR_METEOR_RED] = sMiniorLevelUpLearnset, [SPECIES_KOMALA] = sKomalaLevelUpLearnset, [SPECIES_TURTONATOR] = sTurtonatorLevelUpLearnset, [SPECIES_TOGEDEMARU] = sTogedemaruLevelUpLearnset, - [SPECIES_MIMIKYU] = sMimikyuLevelUpLearnset, + [SPECIES_MIMIKYU_DISGUISED] = sMimikyuLevelUpLearnset, [SPECIES_BRUXISH] = sBruxishLevelUpLearnset, [SPECIES_DRAMPA] = sDrampaLevelUpLearnset, [SPECIES_DHELMISE] = sDhelmiseLevelUpLearnset, @@ -858,13 +858,13 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ARROKUDA] = sArrokudaLevelUpLearnset, [SPECIES_BARRASKEWDA] = sBarraskewdaLevelUpLearnset, [SPECIES_TOXEL] = sToxelLevelUpLearnset, - [SPECIES_TOXTRICITY] = sToxtricityLevelUpLearnset, + [SPECIES_TOXTRICITY_AMPED] = sToxtricityAmpedLevelUpLearnset, [SPECIES_SIZZLIPEDE] = sSizzlipedeLevelUpLearnset, [SPECIES_CENTISKORCH] = sCentiskorchLevelUpLearnset, [SPECIES_CLOBBOPUS] = sClobbopusLevelUpLearnset, [SPECIES_GRAPPLOCT] = sGrapploctLevelUpLearnset, - [SPECIES_SINISTEA] = sSinisteaLevelUpLearnset, - [SPECIES_POLTEAGEIST] = sPolteageistLevelUpLearnset, + [SPECIES_SINISTEA_PHONY] = sSinisteaLevelUpLearnset, + [SPECIES_POLTEAGEIST_PHONY] = sPolteageistLevelUpLearnset, [SPECIES_HATENNA] = sHatennaLevelUpLearnset, [SPECIES_HATTREM] = sHattremLevelUpLearnset, [SPECIES_HATTERENE] = sHattereneLevelUpLearnset, @@ -878,15 +878,15 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MR_RIME] = sMrRimeLevelUpLearnset, [SPECIES_RUNERIGUS] = sRunerigusLevelUpLearnset, [SPECIES_MILCERY] = sMilceryLevelUpLearnset, - [SPECIES_ALCREMIE] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = sAlcremieLevelUpLearnset, [SPECIES_FALINKS] = sFalinksLevelUpLearnset, [SPECIES_PINCURCHIN] = sPincurchinLevelUpLearnset, [SPECIES_SNOM] = sSnomLevelUpLearnset, [SPECIES_FROSMOTH] = sFrosmothLevelUpLearnset, [SPECIES_STONJOURNER] = sStonjournerLevelUpLearnset, - [SPECIES_EISCUE] = sEiscueLevelUpLearnset, - [SPECIES_INDEEDEE] = sIndeedeeLevelUpLearnset, - [SPECIES_MORPEKO] = sMorpekoLevelUpLearnset, + [SPECIES_EISCUE_ICE_FACE] = sEiscueLevelUpLearnset, + [SPECIES_INDEEDEE_MALE] = sIndeedeeMaleLevelUpLearnset, + [SPECIES_MORPEKO_FULL_BELLY] = sMorpekoLevelUpLearnset, [SPECIES_CUFANT] = sCufantLevelUpLearnset, [SPECIES_COPPERAJAH] = sCopperajahLevelUpLearnset, [SPECIES_DRACOZOLT] = sDracozoltLevelUpLearnset, @@ -897,11 +897,11 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DREEPY] = sDreepyLevelUpLearnset, [SPECIES_DRAKLOAK] = sDrakloakLevelUpLearnset, [SPECIES_DRAGAPULT] = sDragapultLevelUpLearnset, - [SPECIES_ZACIAN] = sZacianLevelUpLearnset, - [SPECIES_ZAMAZENTA] = sZamazentaLevelUpLearnset, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sZacianLevelUpLearnset, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaLevelUpLearnset, [SPECIES_ETERNATUS] = sEternatusLevelUpLearnset, [SPECIES_KUBFU] = sKubfuLevelUpLearnset, - [SPECIES_URSHIFU] = sUrshifuLevelUpLearnset, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = sUrshifuSingleStrikeStyleLevelUpLearnset, [SPECIES_ZARUDE] = sZarudeLevelUpLearnset, [SPECIES_REGIELEKI] = sRegielekiLevelUpLearnset, [SPECIES_REGIDRAGO] = sRegidragoLevelUpLearnset, @@ -911,10 +911,10 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_WYRDEER] = sWyrdeerLevelUpLearnset, [SPECIES_KLEAVOR] = sKleavorLevelUpLearnset, [SPECIES_URSALUNA] = sUrsalunaLevelUpLearnset, - [SPECIES_BASCULEGION] = sBasculegionLevelUpLearnset, + [SPECIES_BASCULEGION_MALE] = sBasculegionLevelUpLearnset, [SPECIES_SNEASLER] = sSneaslerLevelUpLearnset, [SPECIES_OVERQWIL] = sOverqwilLevelUpLearnset, - [SPECIES_ENAMORUS] = sEnamorusLevelUpLearnset, + [SPECIES_ENAMORUS_INCARNATE] = sEnamorusLevelUpLearnset, #endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset, @@ -1011,7 +1011,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianLevelUpLearnset, #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianLevelUpLearnset, - [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianLevelUpLearnset, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = sDarmanitanGalarianLevelUpLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset, [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianLevelUpLearnset, #endif @@ -1143,7 +1143,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanLevelUpLearnset, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanGalarianLevelUpLearnset, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanGalarianLevelUpLearnset, // Deerling [SPECIES_DEERLING_SUMMER] = sDeerlingLevelUpLearnset, [SPECIES_DEERLING_AUTUMN] = sDeerlingLevelUpLearnset, @@ -1234,7 +1234,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = // Xerneas [SPECIES_XERNEAS_ACTIVE] = sXerneasLevelUpLearnset, // Zygarde - [SPECIES_ZYGARDE_10] = sZygardeLevelUpLearnset, + [SPECIES_ZYGARDE_10_AURA_BREAK] = sZygardeLevelUpLearnset, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardeLevelUpLearnset, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardeLevelUpLearnset, [SPECIES_ZYGARDE_COMPLETE] = sZygardeLevelUpLearnset, @@ -1305,14 +1305,14 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = sPolteageistLevelUpLearnset, // Alcremie - [SPECIES_ALCREMIE_RUBY_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_MATCHA_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_MINT_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_LEMON_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_SALTED_CREAM] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_RUBY_SWIRL] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = sAlcremieLevelUpLearnset, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAlcremieLevelUpLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAlcremieLevelUpLearnset, // Eiscue [SPECIES_EISCUE_NOICE_FACE] = sEiscueLevelUpLearnset, // Indeedee @@ -1361,7 +1361,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_FLAPPLE_GIGANTAMAX] = sFlappleLevelUpLearnset, [SPECIES_APPLETUN_GIGANTAMAX] = sAppletunLevelUpLearnset, [SPECIES_SANDACONDA_GIGANTAMAX] = sSandacondaLevelUpLearnset, - [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = sToxtricityLevelUpLearnset, + [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = sToxtricityAmpedLevelUpLearnset, [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = sToxtricityLowKeyLevelUpLearnset, [SPECIES_CENTISKORCH_GIGANTAMAX] = sCentiskorchLevelUpLearnset, [SPECIES_HATTERENE_GIGANTAMAX] = sHattereneLevelUpLearnset, @@ -1369,7 +1369,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ALCREMIE_GIGANTAMAX] = sAlcremieLevelUpLearnset, [SPECIES_COPPERAJAH_GIGANTAMAX] = sCopperajahLevelUpLearnset, [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonLevelUpLearnset, - [SPECIES_URSHIFU_GIGANTAMAX] = sUrshifuLevelUpLearnset, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuSingleStrikeStyleLevelUpLearnset, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, #endif }; diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index d7e866d933..092a711918 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -7862,7 +7862,7 @@ static const struct LevelUpMove sJirachiLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDeoxysLevelUpLearnset[] = { +static const struct LevelUpMove sDeoxysNormalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_WRAP), LEVEL_UP_MOVE( 7, MOVE_NIGHT_SHADE), @@ -8356,7 +8356,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -9959,7 +9959,7 @@ static const struct LevelUpMove sDarkraiLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sShayminLevelUpLearnset[] = { +static const struct LevelUpMove sShayminLandLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWTH), LEVEL_UP_MOVE(10, MOVE_MAGICAL_LEAF), LEVEL_UP_MOVE(19, MOVE_LEECH_SEED), @@ -13816,7 +13816,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), @@ -14707,7 +14707,7 @@ static const struct LevelUpMove sDiancieLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sHoopaLevelUpLearnset[] = { +static const struct LevelUpMove sHoopaConfinedLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HYPERSPACE_HOLE), LEVEL_UP_MOVE( 1, MOVE_TRICK), LEVEL_UP_MOVE( 1, MOVE_DESTINY_BOND), @@ -15233,7 +15233,7 @@ static const struct LevelUpMove sRockruffLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLycanrocLevelUpLearnset[] = { +static const struct LevelUpMove sLycanrocMiddayLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ACCELEROCK), LEVEL_UP_MOVE( 1, MOVE_ACCELEROCK), LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), @@ -17156,7 +17156,7 @@ static const struct LevelUpMove sToxelLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sToxtricityLevelUpLearnset[] = { +static const struct LevelUpMove sToxtricityAmpedLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SPARK), LEVEL_UP_MOVE( 1, MOVE_SPARK), LEVEL_UP_MOVE( 1, MOVE_EERIE_IMPULSE), @@ -17678,7 +17678,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -17962,7 +17962,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 940cd68911..ad4822ba47 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -1398,7 +1398,7 @@ .bodyColor = BODY_COLOR_WHITE, \ .noFlip = FALSE -#define URSHIFU_MISC_INFO \ +#define URSHIFU_SINGLE_STRIKE_STYLE_MISC_INFO \ .baseHP = 100, \ .baseAttack = 130, \ .baseDefense = 100, \ @@ -9394,7 +9394,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_CASTFORM] = CASTFORM_SPECIES_INFO(TYPE_NORMAL, BODY_COLOR_GRAY), + [SPECIES_CASTFORM_NORMAL] = CASTFORM_SPECIES_INFO(TYPE_NORMAL, BODY_COLOR_GRAY), [SPECIES_KECLEON] = { @@ -10185,7 +10185,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_MYTHICAL, }, - [SPECIES_DEOXYS] = + [SPECIES_DEOXYS_NORMAL] = { .baseHP = 50, .baseAttack = 150, @@ -10790,9 +10790,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_BURMY] = BURMY_SPECIES_INFO(BODY_COLOR_GREEN), + [SPECIES_BURMY_PLANT_CLOAK] = BURMY_SPECIES_INFO(BODY_COLOR_GREEN), - [SPECIES_WORMADAM] = + [SPECIES_WORMADAM_PLANT_CLOAK] = { .baseHP = 60, .baseAttack = 59, @@ -10975,11 +10975,11 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_CHERRIM] = CHERRIM_SPECIES_INFO(BODY_COLOR_PURPLE), + [SPECIES_CHERRIM_OVERCAST] = CHERRIM_SPECIES_INFO(BODY_COLOR_PURPLE), - [SPECIES_SHELLOS] = SHELLOS_SPECIES_INFO(BODY_COLOR_PURPLE), + [SPECIES_SHELLOS_WEST_SEA] = SHELLOS_SPECIES_INFO(BODY_COLOR_PURPLE), - [SPECIES_GASTRODON] = GASTRODON_SPECIES_INFO(BODY_COLOR_PURPLE), + [SPECIES_GASTRODON_WEST_SEA] = GASTRODON_SPECIES_INFO(BODY_COLOR_PURPLE), [SPECIES_AMBIPOM] = { @@ -12425,7 +12425,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_GIRATINA] = + [SPECIES_GIRATINA_ALTERED] = { .baseHP = 150, .baseAttack = 100, @@ -12541,7 +12541,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_MYTHICAL, }, - [SPECIES_SHAYMIN] = + [SPECIES_SHAYMIN_LAND] = { .baseHP = 100, .baseAttack = 100, @@ -12566,7 +12566,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_MYTHICAL, }, - [SPECIES_ARCEUS] = + [SPECIES_ARCEUS_NORMAL] = { .baseHP = 120, .baseAttack = 120, @@ -13893,7 +13893,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = TRUE, }, - [SPECIES_BASCULIN] = + [SPECIES_BASCULIN_RED_STRIPED] = { .baseHP = 70, .baseAttack = 92, @@ -14011,7 +14011,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_DARMANITAN] = + [SPECIES_DARMANITAN_STANDARD_MODE] = { .baseHP = 105, .baseAttack = 140, @@ -14670,9 +14670,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_DEERLING] = DEERLING_SPECIES_INFO(BODY_COLOR_PINK), + [SPECIES_DEERLING_SPRING] = DEERLING_SPECIES_INFO(BODY_COLOR_PINK), - [SPECIES_SAWSBUCK] = SAWSBUCK_SPECIES_INFO, + [SPECIES_SAWSBUCK_SPRING] = SAWSBUCK_SPECIES_INFO, [SPECIES_EMOLGA] = { @@ -15899,7 +15899,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_TORNADUS] = + [SPECIES_TORNADUS_INCARNATE] = { .baseHP = 79, .baseAttack = 115, @@ -15922,7 +15922,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_THUNDURUS] = + [SPECIES_THUNDURUS_INCARNATE] = { .baseHP = 79, .baseAttack = 115, @@ -15991,7 +15991,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_LANDORUS] = + [SPECIES_LANDORUS_INCARNATE] = { .baseHP = 89, .baseAttack = 125, @@ -16039,7 +16039,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_KELDEO] = + [SPECIES_KELDEO_ORDINARY] = { .baseHP = 91, .baseAttack = 72, @@ -16062,7 +16062,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_MYTHICAL, }, - [SPECIES_MELOETTA] = + [SPECIES_MELOETTA_ARIA] = { .baseHP = 100, .baseAttack = 77, @@ -16445,7 +16445,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_VIVILLON] = VIVILLON_SPECIES_INFO(BODY_COLOR_WHITE), + [SPECIES_VIVILLON_ICY_SNOW] = VIVILLON_SPECIES_INFO(BODY_COLOR_WHITE), [SPECIES_LITLEO] = { @@ -16491,11 +16491,11 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_FLABEBE] = FLABEBE_SPECIES_INFO, + [SPECIES_FLABEBE_RED_FLOWER] = FLABEBE_SPECIES_INFO, - [SPECIES_FLOETTE] = FLOETTE_SPECIES_INFO, + [SPECIES_FLOETTE_RED_FLOWER] = FLOETTE_SPECIES_INFO, - [SPECIES_FLORGES] = FLORGES_SPECIES_INFO, + [SPECIES_FLORGES_RED_FLOWER] = FLORGES_SPECIES_INFO, [SPECIES_SKIDDO] = { @@ -16587,7 +16587,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_FURFROU] = FURFROU_SPECIES_INFO(FLIP), + [SPECIES_FURFROU_NATURAL] = FURFROU_SPECIES_INFO(FLIP), [SPECIES_ESPURR] = { @@ -16611,7 +16611,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_MEOWSTIC] = + [SPECIES_MEOWSTIC_MALE] = { .baseHP = 74, .baseAttack = 48, @@ -16677,7 +16677,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_AEGISLASH] = + [SPECIES_AEGISLASH_SHIELD] = { .baseHP = 60, .baseAttack = 50, @@ -17330,7 +17330,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_PUMPKABOO] = + [SPECIES_PUMPKABOO_AVERAGE] = { .baseHP = 49, .baseAttack = 66, @@ -17341,7 +17341,7 @@ const struct SpeciesInfo gSpeciesInfo[] = PUMKPABOO_MISC_INFO, }, - [SPECIES_GOURGEIST] = + [SPECIES_GOURGEIST_AVERAGE] = { .baseHP = 65, .baseAttack = 90, @@ -17456,7 +17456,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_XERNEAS] = XERNEAS_SPECIES_INFO, + [SPECIES_XERNEAS_NEUTRAL] = XERNEAS_SPECIES_INFO, [SPECIES_YVELTAL] = { @@ -17481,7 +17481,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_ZYGARDE] = ZYGARDE_50_SPECIES_INFO(ABILITY_AURA_BREAK), + [SPECIES_ZYGARDE_50_AURA_BREAK] = ZYGARDE_50_SPECIES_INFO(ABILITY_AURA_BREAK), [SPECIES_DIANCIE] = { @@ -17507,7 +17507,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_MYTHICAL, }, - [SPECIES_HOOPA] = + [SPECIES_HOOPA_CONFINED] = { .baseHP = 80, .baseAttack = 110, @@ -17981,7 +17981,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_ORICORIO] = ORICORIO_SPECIES_INFO(TYPE_FIRE, BODY_COLOR_RED), + [SPECIES_ORICORIO_BAILE] = ORICORIO_SPECIES_INFO(TYPE_FIRE, BODY_COLOR_RED), [SPECIES_CUTIEFLY] = { @@ -18031,7 +18031,7 @@ const struct SpeciesInfo gSpeciesInfo[] = [SPECIES_ROCKRUFF] = ROCKRUFF_SPECIES_INFO(ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_STEADFAST), - [SPECIES_LYCANROC] = + [SPECIES_LYCANROC_MIDDAY] = { .baseHP = 75, .baseAttack = 115, @@ -18053,7 +18053,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_WISHIWASHI] = + [SPECIES_WISHIWASHI_SOLO] = { .baseHP = 45, .baseAttack = 20, @@ -18668,9 +18668,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_SILVALLY] = SILVALLY_SPECIES_INFO(TYPE_NORMAL), + [SPECIES_SILVALLY_NORMAL] = SILVALLY_SPECIES_INFO(TYPE_NORMAL), - [SPECIES_MINIOR] = MINIOR_METEOR_SPECIES_INFO, + [SPECIES_MINIOR_METEOR_RED] = MINIOR_METEOR_SPECIES_INFO, [SPECIES_KOMALA] = { @@ -18740,7 +18740,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_MIMIKYU] = MIMIKYU_SPECIES_INFO, + [SPECIES_MIMIKYU_DISGUISED] = MIMIKYU_SPECIES_INFO, [SPECIES_BRUXISH] = { @@ -20095,7 +20095,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_TOXTRICITY] = + [SPECIES_TOXTRICITY_AMPED] = { TOXTRICITY_MISC_INFO(ABILITY_PLUS), }, @@ -20171,9 +20171,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_SINISTEA] = SINISTEA_SPECIES_INFO, + [SPECIES_SINISTEA_PHONY] = SINISTEA_SPECIES_INFO, - [SPECIES_POLTEAGEIST] = POLTEAGEIST_SPECIES_INFO, + [SPECIES_POLTEAGEIST_PHONY] = POLTEAGEIST_SPECIES_INFO, [SPECIES_HATENNA] = { @@ -20428,7 +20428,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_ALCREMIE] = { ALCREMIE_MISC_INFO(BODY_COLOR_WHITE) }, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_WHITE) }, [SPECIES_FALINKS] = { @@ -20542,7 +20542,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_EISCUE] = + [SPECIES_EISCUE_ICE_FACE] = { .baseHP = 75, .baseAttack = 80, @@ -20564,7 +20564,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_INDEEDEE] = + [SPECIES_INDEEDEE_MALE] = { .baseHP = 60, .baseAttack = 65, @@ -20586,7 +20586,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_MORPEKO] = MORPEKO_SPECIES_INFO, + [SPECIES_MORPEKO_FULL_BELLY] = MORPEKO_SPECIES_INFO, [SPECIES_CUFANT] = { @@ -20775,7 +20775,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_ZACIAN] = + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = { .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, @@ -20798,7 +20798,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_ZAMAZENTA] = + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = { .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, @@ -20867,7 +20867,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_URSHIFU] = { URSHIFU_MISC_INFO, }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = { URSHIFU_SINGLE_STRIKE_STYLE_MISC_INFO, }, [SPECIES_ZARUDE] = ZARUDE_SPECIES_INFO, @@ -21052,7 +21052,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_BASCULEGION] = + [SPECIES_BASCULEGION_MALE] = { .baseHP = 120, .baseAttack = 112, @@ -21141,7 +21141,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_ENAMORUS] = + [SPECIES_ENAMORUS_INCARNATE] = { .baseHP = 74, .baseAttack = 115, @@ -23144,7 +23144,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_GALARIAN_FORM, }, - [SPECIES_DARMANITAN_GALARIAN] = + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = { .baseHP = 105, .baseAttack = 140, @@ -23953,7 +23953,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .baseHP = 105, .baseAttack = 160, @@ -24389,7 +24389,7 @@ const struct SpeciesInfo gSpeciesInfo[] = [SPECIES_XERNEAS_ACTIVE] = XERNEAS_SPECIES_INFO, - [SPECIES_ZYGARDE_10] = ZYGARDE_10_SPECIES_INFO(ABILITY_AURA_BREAK), + [SPECIES_ZYGARDE_10_AURA_BREAK] = ZYGARDE_10_SPECIES_INFO(ABILITY_AURA_BREAK), [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = ZYGARDE_50_SPECIES_INFO(ABILITY_POWER_CONSTRUCT), [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = ZYGARDE_50_SPECIES_INFO(ABILITY_POWER_CONSTRUCT), @@ -24635,14 +24635,14 @@ const struct SpeciesInfo gSpeciesInfo[] = [SPECIES_POLTEAGEIST_ANTIQUE] = POLTEAGEIST_SPECIES_INFO, - [SPECIES_ALCREMIE_RUBY_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_PINK) }, - [SPECIES_ALCREMIE_MATCHA_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_GREEN) }, - [SPECIES_ALCREMIE_MINT_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_BLUE) }, - [SPECIES_ALCREMIE_LEMON_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, - [SPECIES_ALCREMIE_SALTED_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_WHITE) }, - [SPECIES_ALCREMIE_RUBY_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_BROWN) }, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_PINK) }, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_GREEN) }, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_BLUE) }, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_WHITE) }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_BROWN) }, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, [SPECIES_EISCUE_NOICE_FACE] = { @@ -24996,9 +24996,9 @@ const struct SpeciesInfo gSpeciesInfo[] = DURALUDON_MISC_INFO, .gigantamax = TRUE, }, - [SPECIES_URSHIFU_GIGANTAMAX] = + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { - URSHIFU_MISC_INFO, + URSHIFU_SINGLE_STRIKE_STYLE_MISC_INFO, .gigantamax = TRUE, }, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 1273c422ad..8d00b8f05c 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -360,7 +360,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ARON] = sAronTeachableLearnset, [SPECIES_LAIRON] = sLaironTeachableLearnset, [SPECIES_AGGRON] = sAggronTeachableLearnset, - [SPECIES_CASTFORM] = sCastformTeachableLearnset, + [SPECIES_CASTFORM_NORMAL] = sCastformTeachableLearnset, [SPECIES_VOLBEAT] = sVolbeatTeachableLearnset, [SPECIES_ILLUMISE] = sIllumiseTeachableLearnset, [SPECIES_LILEEP] = sLileepTeachableLearnset, @@ -385,7 +385,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_LATIAS] = sLatiasTeachableLearnset, [SPECIES_LATIOS] = sLatiosTeachableLearnset, [SPECIES_JIRACHI] = sJirachiTeachableLearnset, - [SPECIES_DEOXYS] = sDeoxysTeachableLearnset, + [SPECIES_DEOXYS_NORMAL] = sDeoxysNormalTeachableLearnset, [SPECIES_CHIMECHO] = sChimechoTeachableLearnset, #if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = sTurtwigTeachableLearnset, @@ -413,8 +413,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_RAMPARDOS] = sRampardosTeachableLearnset, [SPECIES_SHIELDON] = sShieldonTeachableLearnset, [SPECIES_BASTIODON] = sBastiodonTeachableLearnset, - [SPECIES_BURMY] = sBurmyTeachableLearnset, - [SPECIES_WORMADAM] = sWormadamTeachableLearnset, + [SPECIES_BURMY_PLANT_CLOAK] = sBurmyTeachableLearnset, + [SPECIES_WORMADAM_PLANT_CLOAK] = sWormadamPlantCloakTeachableLearnset, [SPECIES_MOTHIM] = sMothimTeachableLearnset, [SPECIES_COMBEE] = sCombeeTeachableLearnset, [SPECIES_VESPIQUEN] = sVespiquenTeachableLearnset, @@ -422,9 +422,9 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_BUIZEL] = sBuizelTeachableLearnset, [SPECIES_FLOATZEL] = sFloatzelTeachableLearnset, [SPECIES_CHERUBI] = sCherubiTeachableLearnset, - [SPECIES_CHERRIM] = sCherrimTeachableLearnset, - [SPECIES_SHELLOS] = sShellosTeachableLearnset, - [SPECIES_GASTRODON] = sGastrodonTeachableLearnset, + [SPECIES_CHERRIM_OVERCAST] = sCherrimTeachableLearnset, + [SPECIES_SHELLOS_WEST_SEA] = sShellosTeachableLearnset, + [SPECIES_GASTRODON_WEST_SEA] = sGastrodonTeachableLearnset, [SPECIES_AMBIPOM] = sAmbipomTeachableLearnset, [SPECIES_DRIFLOON] = sDrifloonTeachableLearnset, [SPECIES_DRIFBLIM] = sDrifblimTeachableLearnset, @@ -488,13 +488,13 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_PALKIA] = sPalkiaTeachableLearnset, [SPECIES_HEATRAN] = sHeatranTeachableLearnset, [SPECIES_REGIGIGAS] = sRegigigasTeachableLearnset, - [SPECIES_GIRATINA] = sGiratinaTeachableLearnset, + [SPECIES_GIRATINA_ALTERED] = sGiratinaTeachableLearnset, [SPECIES_CRESSELIA] = sCresseliaTeachableLearnset, [SPECIES_PHIONE] = sPhioneTeachableLearnset, [SPECIES_MANAPHY] = sManaphyTeachableLearnset, [SPECIES_DARKRAI] = sDarkraiTeachableLearnset, - [SPECIES_SHAYMIN] = sShayminTeachableLearnset, - [SPECIES_ARCEUS] = sArceusTeachableLearnset, + [SPECIES_SHAYMIN_LAND] = sShayminLandTeachableLearnset, + [SPECIES_ARCEUS_NORMAL] = sArceusTeachableLearnset, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = sVictiniTeachableLearnset, @@ -553,12 +553,12 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_WHIMSICOTT] = sWhimsicottTeachableLearnset, [SPECIES_PETILIL] = sPetililTeachableLearnset, [SPECIES_LILLIGANT] = sLilligantTeachableLearnset, - [SPECIES_BASCULIN] = sBasculinTeachableLearnset, + [SPECIES_BASCULIN_RED_STRIPED] = sBasculinTeachableLearnset, [SPECIES_SANDILE] = sSandileTeachableLearnset, [SPECIES_KROKOROK] = sKrokorokTeachableLearnset, [SPECIES_KROOKODILE] = sKrookodileTeachableLearnset, [SPECIES_DARUMAKA] = sDarumakaTeachableLearnset, - [SPECIES_DARMANITAN] = sDarmanitanTeachableLearnset, + [SPECIES_DARMANITAN_STANDARD_MODE] = sDarmanitanTeachableLearnset, [SPECIES_MARACTUS] = sMaractusTeachableLearnset, [SPECIES_DWEBBLE] = sDwebbleTeachableLearnset, [SPECIES_CRUSTLE] = sCrustleTeachableLearnset, @@ -588,8 +588,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_VANILLITE] = sVanilliteTeachableLearnset, [SPECIES_VANILLISH] = sVanillishTeachableLearnset, [SPECIES_VANILLUXE] = sVanilluxeTeachableLearnset, - [SPECIES_DEERLING] = sDeerlingTeachableLearnset, - [SPECIES_SAWSBUCK] = sSawsbuckTeachableLearnset, + [SPECIES_DEERLING_SPRING] = sDeerlingTeachableLearnset, + [SPECIES_SAWSBUCK_SPRING] = sSawsbuckTeachableLearnset, [SPECIES_EMOLGA] = sEmolgaTeachableLearnset, [SPECIES_KARRABLAST] = sKarrablastTeachableLearnset, [SPECIES_ESCAVALIER] = sEscavalierTeachableLearnset, @@ -644,14 +644,14 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_COBALION] = sCobalionTeachableLearnset, [SPECIES_TERRAKION] = sTerrakionTeachableLearnset, [SPECIES_VIRIZION] = sVirizionTeachableLearnset, - [SPECIES_TORNADUS] = sTornadusTeachableLearnset, - [SPECIES_THUNDURUS] = sThundurusTeachableLearnset, + [SPECIES_TORNADUS_INCARNATE] = sTornadusTeachableLearnset, + [SPECIES_THUNDURUS_INCARNATE] = sThundurusTeachableLearnset, [SPECIES_RESHIRAM] = sReshiramTeachableLearnset, [SPECIES_ZEKROM] = sZekromTeachableLearnset, - [SPECIES_LANDORUS] = sLandorusTeachableLearnset, + [SPECIES_LANDORUS_INCARNATE] = sLandorusTeachableLearnset, [SPECIES_KYUREM] = sKyuremTeachableLearnset, - [SPECIES_KELDEO] = sKeldeoTeachableLearnset, - [SPECIES_MELOETTA] = sMeloettaTeachableLearnset, + [SPECIES_KELDEO_ORDINARY] = sKeldeoTeachableLearnset, + [SPECIES_MELOETTA_ARIA] = sMeloettaTeachableLearnset, [SPECIES_GENESECT] = sGenesectTeachableLearnset, #endif #if P_GEN_6_POKEMON == TRUE @@ -671,22 +671,22 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_TALONFLAME] = sTalonflameTeachableLearnset, [SPECIES_SCATTERBUG] = sScatterbugTeachableLearnset, [SPECIES_SPEWPA] = sSpewpaTeachableLearnset, - [SPECIES_VIVILLON] = sVivillonTeachableLearnset, + [SPECIES_VIVILLON_ICY_SNOW] = sVivillonTeachableLearnset, [SPECIES_LITLEO] = sLitleoTeachableLearnset, [SPECIES_PYROAR] = sPyroarTeachableLearnset, - [SPECIES_FLABEBE] = sFlabebeTeachableLearnset, - [SPECIES_FLOETTE] = sFloetteTeachableLearnset, - [SPECIES_FLORGES] = sFlorgesTeachableLearnset, + [SPECIES_FLABEBE_RED_FLOWER] = sFlabebeTeachableLearnset, + [SPECIES_FLOETTE_RED_FLOWER] = sFloetteTeachableLearnset, + [SPECIES_FLORGES_RED_FLOWER] = sFlorgesTeachableLearnset, [SPECIES_SKIDDO] = sSkiddoTeachableLearnset, [SPECIES_GOGOAT] = sGogoatTeachableLearnset, [SPECIES_PANCHAM] = sPanchamTeachableLearnset, [SPECIES_PANGORO] = sPangoroTeachableLearnset, - [SPECIES_FURFROU] = sFurfrouTeachableLearnset, + [SPECIES_FURFROU_NATURAL] = sFurfrouTeachableLearnset, [SPECIES_ESPURR] = sEspurrTeachableLearnset, - [SPECIES_MEOWSTIC] = sMeowsticTeachableLearnset, + [SPECIES_MEOWSTIC] = sMeowsticMaleTeachableLearnset, [SPECIES_HONEDGE] = sHonedgeTeachableLearnset, [SPECIES_DOUBLADE] = sDoubladeTeachableLearnset, - [SPECIES_AEGISLASH] = sAegislashTeachableLearnset, + [SPECIES_AEGISLASH_SHIELD] = sAegislashTeachableLearnset, [SPECIES_SPRITZEE] = sSpritzeeTeachableLearnset, [SPECIES_AROMATISSE] = sAromatisseTeachableLearnset, [SPECIES_SWIRLIX] = sSwirlixTeachableLearnset, @@ -715,17 +715,17 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_KLEFKI] = sKlefkiTeachableLearnset, [SPECIES_PHANTUMP] = sPhantumpTeachableLearnset, [SPECIES_TREVENANT] = sTrevenantTeachableLearnset, - [SPECIES_PUMPKABOO] = sPumpkabooTeachableLearnset, - [SPECIES_GOURGEIST] = sGourgeistTeachableLearnset, + [SPECIES_PUMPKABOO_AVERAGE] = sPumpkabooTeachableLearnset, + [SPECIES_GOURGEIST_AVERAGE] = sGourgeistTeachableLearnset, [SPECIES_BERGMITE] = sBergmiteTeachableLearnset, [SPECIES_AVALUGG] = sAvaluggTeachableLearnset, [SPECIES_NOIBAT] = sNoibatTeachableLearnset, [SPECIES_NOIVERN] = sNoivernTeachableLearnset, - [SPECIES_XERNEAS] = sXerneasTeachableLearnset, + [SPECIES_XERNEAS_NEUTRAL] = sXerneasTeachableLearnset, [SPECIES_YVELTAL] = sYveltalTeachableLearnset, - [SPECIES_ZYGARDE] = sZygardeTeachableLearnset, + [SPECIES_ZYGARDE_50_AURA_BREAK] = sZygardeTeachableLearnset, [SPECIES_DIANCIE] = sDiancieTeachableLearnset, - [SPECIES_HOOPA] = sHoopaTeachableLearnset, + [SPECIES_HOOPA_CONFINED] = sHoopaConfinedTeachableLearnset, [SPECIES_VOLCANION] = sVolcanionTeachableLearnset, #endif #if P_GEN_7_POKEMON == TRUE @@ -748,12 +748,12 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_VIKAVOLT] = sVikavoltTeachableLearnset, [SPECIES_CRABRAWLER] = sCrabrawlerTeachableLearnset, [SPECIES_CRABOMINABLE] = sCrabominableTeachableLearnset, - [SPECIES_ORICORIO] = sOricorioTeachableLearnset, + [SPECIES_ORICORIO_BAILE] = sOricorioTeachableLearnset, [SPECIES_CUTIEFLY] = sCutieflyTeachableLearnset, [SPECIES_RIBOMBEE] = sRibombeeTeachableLearnset, [SPECIES_ROCKRUFF] = sRockruffTeachableLearnset, - [SPECIES_LYCANROC] = sLycanrocTeachableLearnset, - [SPECIES_WISHIWASHI] = sWishiwashiTeachableLearnset, + [SPECIES_LYCANROC_MIDDAY] = sLycanrocMiddayTeachableLearnset, + [SPECIES_WISHIWASHI_SOLO] = sWishiwashiTeachableLearnset, [SPECIES_MAREANIE] = sMareanieTeachableLearnset, [SPECIES_TOXAPEX] = sToxapexTeachableLearnset, [SPECIES_MUDBRAY] = sMudbrayTeachableLearnset, @@ -780,12 +780,12 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_PALOSSAND] = sPalossandTeachableLearnset, [SPECIES_PYUKUMUKU] = sPyukumukuTeachableLearnset, [SPECIES_TYPE_NULL] = sTypeNullTeachableLearnset, - [SPECIES_SILVALLY] = sSilvallyTeachableLearnset, - [SPECIES_MINIOR] = sMiniorTeachableLearnset, + [SPECIES_SILVALLY_NORMAL] = sSilvallyTeachableLearnset, + [SPECIES_MINIOR_METEOR_RED] = sMiniorTeachableLearnset, [SPECIES_KOMALA] = sKomalaTeachableLearnset, [SPECIES_TURTONATOR] = sTurtonatorTeachableLearnset, [SPECIES_TOGEDEMARU] = sTogedemaruTeachableLearnset, - [SPECIES_MIMIKYU] = sMimikyuTeachableLearnset, + [SPECIES_MIMIKYU_DISGUISED] = sMimikyuTeachableLearnset, [SPECIES_BRUXISH] = sBruxishTeachableLearnset, [SPECIES_DRAMPA] = sDrampaTeachableLearnset, [SPECIES_DHELMISE] = sDhelmiseTeachableLearnset, @@ -858,13 +858,13 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ARROKUDA] = sArrokudaTeachableLearnset, [SPECIES_BARRASKEWDA] = sBarraskewdaTeachableLearnset, [SPECIES_TOXEL] = sToxelTeachableLearnset, - [SPECIES_TOXTRICITY] = sToxtricityTeachableLearnset, + [SPECIES_TOXTRICITY_AMPED] = sToxtricityAmpedTeachableLearnset, [SPECIES_SIZZLIPEDE] = sSizzlipedeTeachableLearnset, [SPECIES_CENTISKORCH] = sCentiskorchTeachableLearnset, [SPECIES_CLOBBOPUS] = sClobbopusTeachableLearnset, [SPECIES_GRAPPLOCT] = sGrapploctTeachableLearnset, - [SPECIES_SINISTEA] = sSinisteaTeachableLearnset, - [SPECIES_POLTEAGEIST] = sPolteageistTeachableLearnset, + [SPECIES_SINISTEA_PHONY] = sSinisteaTeachableLearnset, + [SPECIES_POLTEAGEIST_PHONY] = sPolteageistTeachableLearnset, [SPECIES_HATENNA] = sHatennaTeachableLearnset, [SPECIES_HATTREM] = sHattremTeachableLearnset, [SPECIES_HATTERENE] = sHattereneTeachableLearnset, @@ -878,15 +878,15 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MR_RIME] = sMrRimeTeachableLearnset, [SPECIES_RUNERIGUS] = sRunerigusTeachableLearnset, [SPECIES_MILCERY] = sMilceryTeachableLearnset, - [SPECIES_ALCREMIE] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = sAlcremieTeachableLearnset, [SPECIES_FALINKS] = sFalinksTeachableLearnset, [SPECIES_PINCURCHIN] = sPincurchinTeachableLearnset, [SPECIES_SNOM] = sSnomTeachableLearnset, [SPECIES_FROSMOTH] = sFrosmothTeachableLearnset, [SPECIES_STONJOURNER] = sStonjournerTeachableLearnset, - [SPECIES_EISCUE] = sEiscueTeachableLearnset, - [SPECIES_INDEEDEE] = sIndeedeeTeachableLearnset, - [SPECIES_MORPEKO] = sMorpekoTeachableLearnset, + [SPECIES_EISCUE_ICE_FACE] = sEiscueTeachableLearnset, + [SPECIES_INDEEDEE_MALE] = sIndeedeeMaleTeachableLearnset, + [SPECIES_MORPEKO_FULL_BELLY] = sMorpekoTeachableLearnset, [SPECIES_CUFANT] = sCufantTeachableLearnset, [SPECIES_COPPERAJAH] = sCopperajahTeachableLearnset, [SPECIES_DRACOZOLT] = sDracozoltTeachableLearnset, @@ -897,11 +897,11 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DREEPY] = sDreepyTeachableLearnset, [SPECIES_DRAKLOAK] = sDrakloakTeachableLearnset, [SPECIES_DRAGAPULT] = sDragapultTeachableLearnset, - [SPECIES_ZACIAN] = sZacianTeachableLearnset, - [SPECIES_ZAMAZENTA] = sZamazentaTeachableLearnset, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sZacianTeachableLearnset, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaTeachableLearnset, [SPECIES_ETERNATUS] = sEternatusTeachableLearnset, [SPECIES_KUBFU] = sKubfuTeachableLearnset, - [SPECIES_URSHIFU] = sUrshifuTeachableLearnset, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = sUrshifuSingleStrikeStyleTeachableLearnset, [SPECIES_ZARUDE] = sZarudeTeachableLearnset, [SPECIES_REGIELEKI] = sRegielekiTeachableLearnset, [SPECIES_REGIDRAGO] = sRegidragoTeachableLearnset, @@ -911,10 +911,10 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_WYRDEER] = sWyrdeerTeachableLearnset, [SPECIES_KLEAVOR] = sKleavorTeachableLearnset, [SPECIES_URSALUNA] = sUrsalunaTeachableLearnset, - [SPECIES_BASCULEGION] = sBasculegionTeachableLearnset, + [SPECIES_BASCULEGION_MALE] = sBasculegionTeachableLearnset, [SPECIES_SNEASLER] = sSneaslerTeachableLearnset, [SPECIES_OVERQWIL] = sOverqwilTeachableLearnset, - [SPECIES_ENAMORUS] = sEnamorusTeachableLearnset, + [SPECIES_ENAMORUS_INCARNATE] = sEnamorusTeachableLearnset, #endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset, @@ -1011,7 +1011,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianTeachableLearnset, #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianTeachableLearnset, - [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianTeachableLearnset, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = sDarmanitanGalarianTeachableLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianTeachableLearnset, [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianTeachableLearnset, #endif @@ -1143,7 +1143,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinTeachableLearnset, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanTeachableLearnset, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanGalarianTeachableLearnset, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sDarmanitanGalarianTeachableLearnset, // Deerling [SPECIES_DEERLING_SUMMER] = sDeerlingTeachableLearnset, [SPECIES_DEERLING_AUTUMN] = sDeerlingTeachableLearnset, @@ -1234,7 +1234,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = // Xerneas [SPECIES_XERNEAS_ACTIVE] = sXerneasTeachableLearnset, // Zygarde - [SPECIES_ZYGARDE_10] = sZygardeTeachableLearnset, + [SPECIES_ZYGARDE_10_AURA_BREAK] = sZygardeTeachableLearnset, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sZygardeTeachableLearnset, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sZygardeTeachableLearnset, [SPECIES_ZYGARDE_COMPLETE] = sZygardeTeachableLearnset, @@ -1305,14 +1305,14 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = sPolteageistTeachableLearnset, // Alcremie - [SPECIES_ALCREMIE_RUBY_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_MATCHA_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_MINT_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_LEMON_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_SALTED_CREAM] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_RUBY_SWIRL] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = sAlcremieTeachableLearnset, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAlcremieTeachableLearnset, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAlcremieTeachableLearnset, // Eiscue [SPECIES_EISCUE_NOICE_FACE] = sEiscueTeachableLearnset, // Indeedee @@ -1361,7 +1361,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_FLAPPLE_GIGANTAMAX] = sFlappleTeachableLearnset, [SPECIES_APPLETUN_GIGANTAMAX] = sAppletunTeachableLearnset, [SPECIES_SANDACONDA_GIGANTAMAX] = sSandacondaTeachableLearnset, - [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = sToxtricityTeachableLearnset, + [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = sToxtricityAmpedTeachableLearnset, [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = sToxtricityLowKeyTeachableLearnset, [SPECIES_CENTISKORCH_GIGANTAMAX] = sCentiskorchTeachableLearnset, [SPECIES_HATTERENE_GIGANTAMAX] = sHattereneTeachableLearnset, @@ -1369,7 +1369,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ALCREMIE_GIGANTAMAX] = sAlcremieTeachableLearnset, [SPECIES_COPPERAJAH_GIGANTAMAX] = sCopperajahTeachableLearnset, [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonTeachableLearnset, - [SPECIES_URSHIFU_GIGANTAMAX] = sUrshifuTeachableLearnset, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuSingleStrikeStyleTeachableLearnset, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, #endif }; diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index b0f162c6d9..471d658f38 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -16053,7 +16053,7 @@ static const u16 sJirachiTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sDeoxysTeachableLearnset[] = { +static const u16 sDeoxysNormalTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_CALM_MIND, @@ -17025,7 +17025,7 @@ static const u16 sBurmyTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sWormadamTeachableLearnset[] = { +static const u16 sWormadamPlantCloakTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BULLET_SEED, MOVE_DOUBLE_TEAM, @@ -20141,7 +20141,7 @@ static const u16 sDarkraiTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sShayminTeachableLearnset[] = { +static const u16 sShayminLandTeachableLearnset[] = { MOVE_BULLET_SEED, MOVE_DOUBLE_TEAM, MOVE_FACADE, @@ -26250,7 +26250,7 @@ static const u16 sEspurrTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sMeowsticTeachableLearnset[] = { +static const u16 sMeowsticMaleTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_CUT, @@ -27666,7 +27666,7 @@ static const u16 sDiancieTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sHoopaTeachableLearnset[] = { +static const u16 sHoopaConfinedTeachableLearnset[] = { MOVE_BRICK_BREAK, MOVE_CALM_MIND, MOVE_DOUBLE_TEAM, @@ -28364,7 +28364,7 @@ static const u16 sRockruffTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sLycanrocTeachableLearnset[] = { +static const u16 sLycanrocMiddayTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_BULK_UP, @@ -30945,7 +30945,7 @@ static const u16 sToxelTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sToxtricityTeachableLearnset[] = { +static const u16 sToxtricityAmpedTeachableLearnset[] = { MOVE_ATTRACT, MOVE_FACADE, MOVE_HYPER_BEAM, @@ -31538,7 +31538,7 @@ static const u16 sEiscueTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sIndeedeeTeachableLearnset[] = { +static const u16 sIndeedeeMaleTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_FACADE, @@ -31908,7 +31908,7 @@ static const u16 sKubfuTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sUrshifuTeachableLearnset[] = { +static const u16 sUrshifuSingleStrikeStyleTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BRICK_BREAK, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 97444fa3a8..8937606fa8 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -383,7 +383,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_ARON] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_LAIRON] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 15 }, [SPECIES_AGGRON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_CASTFORM] = { .size = MON_COORDS_SIZE(32, 64), .y_offset = 0 }, + [SPECIES_CASTFORM_NORMAL] = { .size = MON_COORDS_SIZE(32, 64), .y_offset = 0 }, [SPECIES_VOLBEAT] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_ILLUMISE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, [SPECIES_LILEEP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, @@ -408,7 +408,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_LATIAS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_LATIOS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_JIRACHI] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_DEOXYS] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_DEOXYS_NORMAL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_CHIMECHO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, #if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, @@ -436,8 +436,8 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_RAMPARDOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_SHIELDON] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_BASTIODON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_BURMY] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 6 }, - [SPECIES_WORMADAM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_BURMY_PLANT_CLOAK] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 6 }, + [SPECIES_WORMADAM_PLANT_CLOAK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_MOTHIM] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_COMBEE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 22 }, [SPECIES_VESPIQUEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -445,9 +445,9 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_BUIZEL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_FLOATZEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_CHERUBI] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, - [SPECIES_CHERRIM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 9 }, - [SPECIES_SHELLOS] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 8 }, - [SPECIES_GASTRODON] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, + [SPECIES_CHERRIM_OVERCAST] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 9 }, + [SPECIES_SHELLOS_WEST_SEA] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 8 }, + [SPECIES_GASTRODON_WEST_SEA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_AMBIPOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_DRIFLOON] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, [SPECIES_DRIFBLIM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, @@ -511,13 +511,13 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_PALKIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_HEATRAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_REGIGIGAS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, - [SPECIES_GIRATINA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_GIRATINA_ALTERED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_CRESSELIA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 10 }, [SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SHAYMIN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, - [SPECIES_ARCEUS] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_SHAYMIN_LAND] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, + [SPECIES_ARCEUS_NORMAL] = ARCEUS_BACK_PIC_COORDS, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 7 }, @@ -576,12 +576,12 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_WHIMSICOTT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_PETILIL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 9 }, [SPECIES_LILLIGANT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_BASCULIN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 16 }, + [SPECIES_BASCULIN_RED_STRIPED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 16 }, [SPECIES_SANDILE] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 18 }, [SPECIES_KROKOROK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_KROOKODILE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_DARUMAKA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 12 }, - [SPECIES_DARMANITAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_DARMANITAN_STANDARD_MODE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MARACTUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_DWEBBLE] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 17 }, [SPECIES_CRUSTLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, @@ -611,8 +611,8 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_VANILLITE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, [SPECIES_VANILLISH] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_VANILLUXE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_DEERLING] = DEERLING_BACK_PIC_COORDS, - [SPECIES_SAWSBUCK] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, + [SPECIES_DEERLING_SPRING] = DEERLING_BACK_PIC_COORDS, + [SPECIES_SAWSBUCK_SPRING] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, [SPECIES_EMOLGA] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 16 }, [SPECIES_KARRABLAST] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 14 }, [SPECIES_ESCAVALIER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, @@ -667,14 +667,14 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_COBALION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 6 }, [SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_VIRIZION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_TORNADUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_THUNDURUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TORNADUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_THUNDURUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_RESHIRAM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_ZEKROM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_LANDORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LANDORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KYUREM] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_KELDEO] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 4 }, - [SPECIES_MELOETTA] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, + [SPECIES_KELDEO_ORDINARY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 4 }, + [SPECIES_MELOETTA_ARIA] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, #endif #if P_GEN_6_POKEMON == TRUE @@ -694,22 +694,22 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_TALONFLAME] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_SCATTERBUG] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 12 }, [SPECIES_SPEWPA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, - [SPECIES_VIVILLON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_ICY_SNOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LITLEO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_PYROAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_FLABEBE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, - [SPECIES_FLOETTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_FLORGES] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_FLABEBE_RED_FLOWER] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, + [SPECIES_FLOETTE_RED_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_FLORGES_RED_FLOWER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_SKIDDO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_GOGOAT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, [SPECIES_PANCHAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_PANGORO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_FURFROU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_FURFROU_NATURAL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_ESPURR] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, - [SPECIES_MEOWSTIC] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_MEOWSTIC_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_HONEDGE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_DOUBLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_AEGISLASH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_AEGISLASH_SHIELD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_SPRITZEE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_AROMATISSE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_SWIRLIX] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, @@ -738,17 +738,17 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_KLEFKI] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 8 }, [SPECIES_PHANTUMP] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, [SPECIES_TREVENANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_PUMPKABOO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, - [SPECIES_GOURGEIST] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_PUMPKABOO_AVERAGE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, + [SPECIES_GOURGEIST_AVERAGE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_BERGMITE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, [SPECIES_AVALUGG] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_NOIBAT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 7 }, [SPECIES_NOIVERN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_XERNEAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_XERNEAS_NEUTRAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_YVELTAL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, - [SPECIES_ZYGARDE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_ZYGARDE_50_AURA_BREAK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_DIANCIE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_HOOPA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, + [SPECIES_HOOPA_CONFINED] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_VOLCANION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, #endif #if P_GEN_7_POKEMON == TRUE @@ -771,12 +771,12 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_VIKAVOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CRABRAWLER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ORICORIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ORICORIO_BAILE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 15 }, [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_LYCANROC] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_WISHIWASHI] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 18 }, + [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, + [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 18 }, [SPECIES_MAREANIE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 15 }, [SPECIES_TOXAPEX] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_MUDBRAY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, @@ -803,12 +803,12 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_PALOSSAND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_PYUKUMUKU] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 16 }, [SPECIES_TYPE_NULL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_SILVALLY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_MINIOR] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, + [SPECIES_SILVALLY_NORMAL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 14 }, [SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 9 }, [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, - [SPECIES_MIMIKYU] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 14 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, @@ -881,13 +881,13 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_ARROKUDA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_BARRASKEWDA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_TOXEL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, - [SPECIES_TOXTRICITY] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_TOXTRICITY_AMPED] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_SIZZLIPEDE] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_CENTISKORCH] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_CLOBBOPUS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_GRAPPLOCT] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_SINISTEA] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 16 }, - [SPECIES_POLTEAGEIST] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, + [SPECIES_SINISTEA_PHONY] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 16 }, + [SPECIES_POLTEAGEIST_PHONY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_HATENNA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_HATTREM] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_HATTERENE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, @@ -901,15 +901,15 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_MR_RIME] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_RUNERIGUS] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_MILCERY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 16 }, - [SPECIES_ALCREMIE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_FALINKS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 15 }, [SPECIES_PINCURCHIN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_SNOM] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, [SPECIES_FROSMOTH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_STONJOURNER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_EISCUE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_INDEEDEE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, - [SPECIES_MORPEKO] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, + [SPECIES_EISCUE_ICE_FACE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, + [SPECIES_INDEEDEE_MALE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_MORPEKO_FULL_BELLY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, [SPECIES_CUFANT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_COPPERAJAH] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 16 }, [SPECIES_DRACOZOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, @@ -920,11 +920,11 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_DREEPY] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_DRAKLOAK] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_DRAGAPULT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - [SPECIES_ZACIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_ZAMAZENTA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_ETERNATUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_KUBFU] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, - [SPECIES_URSHIFU] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_ZARUDE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_REGIELEKI] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_REGIDRAGO] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, @@ -934,10 +934,10 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_WYRDEER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, - [SPECIES_BASCULEGION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BASCULEGION_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, - [SPECIES_ENAMORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_CHARIZARD_MEGA_X] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -1033,7 +1033,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_LINOONE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, - [SPECIES_DARMANITAN_GALARIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_YAMASK_GALARIAN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_STUNFISK_GALARIAN] = { .size = MON_COORDS_SIZE(64, 24), .y_offset = 23 }, #endif @@ -1165,7 +1165,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 16 }, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, // Deerling [SPECIES_DEERLING_SUMMER] = DEERLING_BACK_PIC_COORDS, [SPECIES_DEERLING_AUTUMN] = DEERLING_BACK_PIC_COORDS, @@ -1256,7 +1256,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = // Xerneas [SPECIES_XERNEAS_ACTIVE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, // Zygarde - [SPECIES_ZYGARDE_10] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, + [SPECIES_ZYGARDE_10_AURA_BREAK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_ZYGARDE_COMPLETE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1327,14 +1327,14 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, // Alcremie - [SPECIES_ALCREMIE_RUBY_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_MINT_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_LEMON_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_SALTED_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, // Eiscue [SPECIES_EISCUE_NOICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, // Indeedee @@ -1391,7 +1391,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_ALCREMIE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_COPPERAJAH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_DURALUDON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, #endif [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 033ab366a8..bdab1335ea 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -360,7 +360,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ARON, gMonBackPic_Aron), SPECIES_SPRITE(LAIRON, gMonBackPic_Lairon), SPECIES_SPRITE(AGGRON, gMonBackPic_Aggron), - SPECIES_SPRITE(CASTFORM, gMonBackPic_Castform), + SPECIES_SPRITE(CASTFORM_NORMAL, gMonBackPic_CastformNormal), SPECIES_SPRITE(VOLBEAT, gMonBackPic_Volbeat), SPECIES_SPRITE(ILLUMISE, gMonBackPic_Illumise), SPECIES_SPRITE(LILEEP, gMonBackPic_Lileep), @@ -385,7 +385,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(LATIAS, gMonBackPic_Latias), SPECIES_SPRITE(LATIOS, gMonBackPic_Latios), SPECIES_SPRITE(JIRACHI, gMonBackPic_Jirachi), - SPECIES_SPRITE(DEOXYS, gMonBackPic_Deoxys), + SPECIES_SPRITE(DEOXYS_NORMAL, gMonBackPic_DeoxysNormal), SPECIES_SPRITE(CHIMECHO, gMonBackPic_Chimecho), #if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(TURTWIG, gMonBackPic_Turtwig), @@ -413,8 +413,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(RAMPARDOS, gMonBackPic_Rampardos), SPECIES_SPRITE(SHIELDON, gMonBackPic_Shieldon), SPECIES_SPRITE(BASTIODON, gMonBackPic_Bastiodon), - SPECIES_SPRITE(BURMY, gMonBackPic_Burmy), - SPECIES_SPRITE(WORMADAM, gMonBackPic_Wormadam), + SPECIES_SPRITE(BURMY_PLANT_CLOAK, gMonBackPic_BurmyPlantCloak), + SPECIES_SPRITE(WORMADAM_PLANT_CLOAK, gMonBackPic_WormadamPlantCloak), SPECIES_SPRITE(MOTHIM, gMonBackPic_Mothim), SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), SPECIES_SPRITE(VESPIQUEN, gMonBackPic_Vespiquen), @@ -422,9 +422,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(BUIZEL, gMonBackPic_Buizel), SPECIES_SPRITE(FLOATZEL, gMonBackPic_Floatzel), SPECIES_SPRITE(CHERUBI, gMonBackPic_Cherubi), - SPECIES_SPRITE(CHERRIM, gMonBackPic_Cherrim), - SPECIES_SPRITE(SHELLOS, gMonBackPic_Shellos), - SPECIES_SPRITE(GASTRODON, gMonBackPic_Gastrodon), + SPECIES_SPRITE(CHERRIM_OVERCAST, gMonBackPic_CherrimOvercast), + SPECIES_SPRITE(SHELLOS_WEST_SEA, gMonBackPic_ShellosWestSea), + SPECIES_SPRITE(GASTRODON_WEST_SEA, gMonBackPic_GastrodonWestSea), SPECIES_SPRITE(AMBIPOM, gMonBackPic_Ambipom), SPECIES_SPRITE(DRIFLOON, gMonBackPic_Drifloon), SPECIES_SPRITE(DRIFBLIM, gMonBackPic_Drifblim), @@ -488,12 +488,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PALKIA, gMonBackPic_Palkia), SPECIES_SPRITE(HEATRAN, gMonBackPic_Heatran), SPECIES_SPRITE(REGIGIGAS, gMonBackPic_Regigigas), - SPECIES_SPRITE(GIRATINA, gMonBackPic_Giratina), + SPECIES_SPRITE(GIRATINA_ALTERED, gMonBackPic_GiratinaAltered), SPECIES_SPRITE(CRESSELIA, gMonBackPic_Cresselia), SPECIES_SPRITE(PHIONE, gMonBackPic_Phione), SPECIES_SPRITE(MANAPHY, gMonBackPic_Manaphy), SPECIES_SPRITE(DARKRAI, gMonBackPic_Darkrai), - SPECIES_SPRITE(SHAYMIN, gMonBackPic_Shaymin), + SPECIES_SPRITE(SHAYMIN_LAND, gMonBackPic_ShayminLand), SPECIES_SPRITE(ARCEUS, gMonBackPic_Arceus), #endif #if P_GEN_5_POKEMON == TRUE @@ -553,12 +553,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(WHIMSICOTT, gMonBackPic_Whimsicott), SPECIES_SPRITE(PETILIL, gMonBackPic_Petilil), SPECIES_SPRITE(LILLIGANT, gMonBackPic_Lilligant), - SPECIES_SPRITE(BASCULIN, gMonBackPic_Basculin), + SPECIES_SPRITE(BASCULIN, gMonBackPic_BasculinRedStriped), SPECIES_SPRITE(SANDILE, gMonBackPic_Sandile), SPECIES_SPRITE(KROKOROK, gMonBackPic_Krokorok), SPECIES_SPRITE(KROOKODILE, gMonBackPic_Krookodile), SPECIES_SPRITE(DARUMAKA, gMonBackPic_Darumaka), - SPECIES_SPRITE(DARMANITAN, gMonBackPic_Darmanitan), + SPECIES_SPRITE(DARMANITAN_STANDARD_MODE, gMonBackPic_DarmanitanStandardMode), SPECIES_SPRITE(MARACTUS, gMonBackPic_Maractus), SPECIES_SPRITE(DWEBBLE, gMonBackPic_Dwebble), SPECIES_SPRITE(CRUSTLE, gMonBackPic_Crustle), @@ -588,8 +588,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(VANILLITE, gMonBackPic_Vanillite), SPECIES_SPRITE(VANILLISH, gMonBackPic_Vanillish), SPECIES_SPRITE(VANILLUXE, gMonBackPic_Vanilluxe), - SPECIES_SPRITE(DEERLING, gMonBackPic_Deerling), - SPECIES_SPRITE(SAWSBUCK, gMonBackPic_Sawsbuck), + SPECIES_SPRITE(DEERLING_SPRING, gMonBackPic_Deerling), + SPECIES_SPRITE(SAWSBUCK_SPRING, gMonBackPic_SawsbuckSpring), SPECIES_SPRITE(EMOLGA, gMonBackPic_Emolga), SPECIES_SPRITE(KARRABLAST, gMonBackPic_Karrablast), SPECIES_SPRITE(ESCAVALIER, gMonBackPic_Escavalier), @@ -644,14 +644,14 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(COBALION, gMonBackPic_Cobalion), SPECIES_SPRITE(TERRAKION, gMonBackPic_Terrakion), SPECIES_SPRITE(VIRIZION, gMonBackPic_Virizion), - SPECIES_SPRITE(TORNADUS, gMonBackPic_Tornadus), - SPECIES_SPRITE(THUNDURUS, gMonBackPic_Thundurus), + SPECIES_SPRITE(TORNADUS_INCARNATE, gMonBackPic_TornadusIncarnate), + SPECIES_SPRITE(THUNDURUS_INCARNATE, gMonBackPic_ThundurusIncarnate), SPECIES_SPRITE(RESHIRAM, gMonBackPic_Reshiram), SPECIES_SPRITE(ZEKROM, gMonBackPic_Zekrom), - SPECIES_SPRITE(LANDORUS, gMonBackPic_Landorus), + SPECIES_SPRITE(LANDORUS_INCARNATE, gMonBackPic_LandorusIncarnate), SPECIES_SPRITE(KYUREM, gMonBackPic_Kyurem), - SPECIES_SPRITE(KELDEO, gMonBackPic_Keldeo), - SPECIES_SPRITE(MELOETTA, gMonBackPic_Meloetta), + SPECIES_SPRITE(KELDEO_ORDINARY, gMonBackPic_KeldeoOrdinary), + SPECIES_SPRITE(MELOETTA, gMonBackPic_MeloettaAria), SPECIES_SPRITE(GENESECT, gMonBackPic_Genesect), #endif #if P_GEN_6_POKEMON == TRUE @@ -671,22 +671,22 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(TALONFLAME, gMonBackPic_Talonflame), SPECIES_SPRITE(SCATTERBUG, gMonBackPic_Scatterbug), SPECIES_SPRITE(SPEWPA, gMonBackPic_Spewpa), - SPECIES_SPRITE(VIVILLON, gMonBackPic_Vivillon), + SPECIES_SPRITE(VIVILLON_ICY_SNOW, gMonBackPic_VivillonIcySnow), SPECIES_SPRITE(LITLEO, gMonBackPic_Litleo), SPECIES_SPRITE(PYROAR, gMonBackPic_Pyroar), - SPECIES_SPRITE(FLABEBE, gMonBackPic_Flabebe), - SPECIES_SPRITE(FLOETTE, gMonBackPic_Floette), - SPECIES_SPRITE(FLORGES, gMonBackPic_Florges), + SPECIES_SPRITE(FLABEBE_RED_FLOWER, gMonBackPic_Flabebe), + SPECIES_SPRITE(FLOETTE_RED_FLOWER, gMonBackPic_Floette), + SPECIES_SPRITE(FLORGES_RED_FLOWER, gMonBackPic_Florges), SPECIES_SPRITE(SKIDDO, gMonBackPic_Skiddo), SPECIES_SPRITE(GOGOAT, gMonBackPic_Gogoat), SPECIES_SPRITE(PANCHAM, gMonBackPic_Pancham), SPECIES_SPRITE(PANGORO, gMonBackPic_Pangoro), - SPECIES_SPRITE(FURFROU, gMonBackPic_Furfrou), + SPECIES_SPRITE(FURFROU_NATURAL, gMonBackPic_FurfrouNatural), SPECIES_SPRITE(ESPURR, gMonBackPic_Espurr), - SPECIES_SPRITE(MEOWSTIC, gMonBackPic_Meowstic), + SPECIES_SPRITE(MEOWSTIC_MALE, gMonBackPic_MeowsticMale), SPECIES_SPRITE(HONEDGE, gMonBackPic_Honedge), SPECIES_SPRITE(DOUBLADE, gMonBackPic_Doublade), - SPECIES_SPRITE(AEGISLASH, gMonBackPic_Aegislash), + SPECIES_SPRITE(AEGISLASH_SHIELD, gMonBackPic_AegislashShield), SPECIES_SPRITE(SPRITZEE, gMonBackPic_Spritzee), SPECIES_SPRITE(AROMATISSE, gMonBackPic_Aromatisse), SPECIES_SPRITE(SWIRLIX, gMonBackPic_Swirlix), @@ -715,17 +715,17 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(KLEFKI, gMonBackPic_Klefki), SPECIES_SPRITE(PHANTUMP, gMonBackPic_Phantump), SPECIES_SPRITE(TREVENANT, gMonBackPic_Trevenant), - SPECIES_SPRITE(PUMPKABOO, gMonBackPic_Pumpkaboo), - SPECIES_SPRITE(GOURGEIST, gMonBackPic_Gourgeist), + SPECIES_SPRITE(PUMPKABOO_AVERAGE, gMonBackPic_PumpkabooAverage), + SPECIES_SPRITE(GOURGEIST_AVERAGE, gMonBackPic_GourgeistAverage), SPECIES_SPRITE(BERGMITE, gMonBackPic_Bergmite), SPECIES_SPRITE(AVALUGG, gMonBackPic_Avalugg), SPECIES_SPRITE(NOIBAT, gMonBackPic_Noibat), SPECIES_SPRITE(NOIVERN, gMonBackPic_Noivern), - SPECIES_SPRITE(XERNEAS, gMonBackPic_Xerneas), + SPECIES_SPRITE(XERNEAS_NEUTRAL, gMonBackPic_XerneasNeutral), SPECIES_SPRITE(YVELTAL, gMonBackPic_Yveltal), - SPECIES_SPRITE(ZYGARDE, gMonBackPic_Zygarde), + SPECIES_SPRITE(ZYGARDE_50_AURA_BREAK, gMonBackPic_Zygarde50), SPECIES_SPRITE(DIANCIE, gMonBackPic_Diancie), - SPECIES_SPRITE(HOOPA, gMonBackPic_Hoopa), + SPECIES_SPRITE(HOOPA_CONFINED, gMonBackPic_HoopaConfined), SPECIES_SPRITE(VOLCANION, gMonBackPic_Volcanion), #endif #if P_GEN_7_POKEMON == TRUE @@ -748,12 +748,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(VIKAVOLT, gMonBackPic_Vikavolt), SPECIES_SPRITE(CRABRAWLER, gMonBackPic_Crabrawler), SPECIES_SPRITE(CRABOMINABLE, gMonBackPic_Crabominable), - SPECIES_SPRITE(ORICORIO, gMonBackPic_Oricorio), + SPECIES_SPRITE(ORICORIO_BAILE, gMonBackPic_OricorioBaile), SPECIES_SPRITE(CUTIEFLY, gMonBackPic_Cutiefly), SPECIES_SPRITE(RIBOMBEE, gMonBackPic_Ribombee), SPECIES_SPRITE(ROCKRUFF, gMonBackPic_Rockruff), - SPECIES_SPRITE(LYCANROC, gMonBackPic_Lycanroc), - SPECIES_SPRITE(WISHIWASHI, gMonBackPic_Wishiwashi), + SPECIES_SPRITE(LYCANROC_MIDDAY, gMonBackPic_LycanrocMidday), + SPECIES_SPRITE(WISHIWASHI_SOLO, gMonBackPic_WishiwashiSolo), SPECIES_SPRITE(MAREANIE, gMonBackPic_Mareanie), SPECIES_SPRITE(TOXAPEX, gMonBackPic_Toxapex), SPECIES_SPRITE(MUDBRAY, gMonBackPic_Mudbray), @@ -781,11 +781,11 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PYUKUMUKU, gMonBackPic_Pyukumuku), SPECIES_SPRITE(TYPE_NULL, gMonBackPic_TypeNull), SPECIES_SPRITE(SILVALLY, gMonBackPic_Silvally), - SPECIES_SPRITE(MINIOR, gMonBackPic_Minior), + SPECIES_SPRITE(MINIOR_METEOR_RED, gMonBackPic_MiniorMeteor), SPECIES_SPRITE(KOMALA, gMonBackPic_Komala), SPECIES_SPRITE(TURTONATOR, gMonBackPic_Turtonator), SPECIES_SPRITE(TOGEDEMARU, gMonBackPic_Togedemaru), - SPECIES_SPRITE(MIMIKYU, gMonBackPic_Mimikyu), + SPECIES_SPRITE(MIMIKYU_DISGUISED, gMonBackPic_MimikyuDisguised), SPECIES_SPRITE(BRUXISH, gMonBackPic_Bruxish), SPECIES_SPRITE(DRAMPA, gMonBackPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonBackPic_Dhelmise), @@ -858,13 +858,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ARROKUDA, gMonBackPic_Arrokuda), SPECIES_SPRITE(BARRASKEWDA, gMonBackPic_Barraskewda), SPECIES_SPRITE(TOXEL, gMonBackPic_Toxel), - SPECIES_SPRITE(TOXTRICITY, gMonBackPic_Toxtricity), + SPECIES_SPRITE(TOXTRICITY_AMPED, gMonBackPic_ToxtricityAmped), SPECIES_SPRITE(SIZZLIPEDE, gMonBackPic_Sizzlipede), SPECIES_SPRITE(CENTISKORCH, gMonBackPic_Centiskorch), SPECIES_SPRITE(CLOBBOPUS, gMonBackPic_Clobbopus), SPECIES_SPRITE(GRAPPLOCT, gMonBackPic_Grapploct), - SPECIES_SPRITE(SINISTEA, gMonBackPic_Sinistea), - SPECIES_SPRITE(POLTEAGEIST, gMonBackPic_Polteageist), + SPECIES_SPRITE(SINISTEA_PHONY, gMonBackPic_Sinistea), + SPECIES_SPRITE(POLTEAGEIST_PHONY, gMonBackPic_Polteageist), SPECIES_SPRITE(HATENNA, gMonBackPic_Hatenna), SPECIES_SPRITE(HATTREM, gMonBackPic_Hattrem), SPECIES_SPRITE(HATTERENE, gMonBackPic_Hatterene), @@ -884,9 +884,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(SNOM, gMonBackPic_Snom), SPECIES_SPRITE(FROSMOTH, gMonBackPic_Frosmoth), SPECIES_SPRITE(STONJOURNER, gMonBackPic_Stonjourner), - SPECIES_SPRITE(EISCUE, gMonBackPic_Eiscue), - SPECIES_SPRITE(INDEEDEE, gMonBackPic_Indeedee), - SPECIES_SPRITE(MORPEKO, gMonBackPic_Morpeko), + SPECIES_SPRITE(EISCUE_ICE_FACE, gMonBackPic_EiscueIceFace), + SPECIES_SPRITE(INDEEDEE_MALE, gMonBackPic_IndeedeeMale), + SPECIES_SPRITE(MORPEKO_FULL_BELLY, gMonBackPic_MorpekoFullBelly), SPECIES_SPRITE(CUFANT, gMonBackPic_Cufant), SPECIES_SPRITE(COPPERAJAH, gMonBackPic_Copperajah), SPECIES_SPRITE(DRACOZOLT, gMonBackPic_Dracozolt), @@ -897,11 +897,11 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(DREEPY, gMonBackPic_Dreepy), SPECIES_SPRITE(DRAKLOAK, gMonBackPic_Drakloak), SPECIES_SPRITE(DRAGAPULT, gMonBackPic_Dragapult), - SPECIES_SPRITE(ZACIAN, gMonBackPic_Zacian), - SPECIES_SPRITE(ZAMAZENTA, gMonBackPic_Zamazenta), + SPECIES_SPRITE(ZACIAN_HERO_OF_MANY_BATTLES, gMonBackPic_ZacianHeroOfManyBattles), + SPECIES_SPRITE(ZAMAZENTA_HERO_OF_MANY_BATTLES, gMonBackPic_ZamazentaHeroOfManyBattles), SPECIES_SPRITE(ETERNATUS, gMonBackPic_Eternatus), SPECIES_SPRITE(KUBFU, gMonBackPic_Kubfu), - SPECIES_SPRITE(URSHIFU, gMonBackPic_Urshifu), + SPECIES_SPRITE(URSHIFU_SINGLE_STRIKE_STYLE, gMonBackPic_UrshifuSingleStrikeStyle), SPECIES_SPRITE(ZARUDE, gMonBackPic_Zarude), SPECIES_SPRITE(REGIELEKI, gMonBackPic_Regieleki), SPECIES_SPRITE(REGIDRAGO, gMonBackPic_Regidrago), @@ -911,10 +911,10 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(WYRDEER, gMonBackPic_Wyrdeer), SPECIES_SPRITE(KLEAVOR, gMonBackPic_Kleavor), SPECIES_SPRITE(URSALUNA, gMonBackPic_Ursaluna), - SPECIES_SPRITE(BASCULEGION, gMonBackPic_Basculegion), + SPECIES_SPRITE(BASCULEGION_MALE, gMonBackPic_BasculegionMale), SPECIES_SPRITE(SNEASLER, gMonBackPic_Sneasler), SPECIES_SPRITE(OVERQWIL, gMonBackPic_Overqwil), - SPECIES_SPRITE(ENAMORUS, gMonBackPic_Enamorus), + SPECIES_SPRITE(ENAMORUS_INCARNATE, gMonBackPic_EnamorusIncarnate), #endif SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_VenusaurMega), @@ -1011,7 +1011,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(LINOONE_GALARIAN, gMonBackPic_LinooneGalarian), #if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonBackPic_DarumakaGalarian), - SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonBackPic_DarmanitanGalarian), + SPECIES_SPRITE(DARMANITAN_GALARIAN_STANDARD_MODE, gMonBackPic_DarmanitanGalarianStandardMode), SPECIES_SPRITE(YAMASK_GALARIAN, gMonBackPic_YamaskGalarian), SPECIES_SPRITE(STUNFISK_GALARIAN, gMonBackPic_StunfiskGalarian), #endif @@ -1141,7 +1141,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonBackPic_BasculinWhiteStriped), SPECIES_SPRITE(DARMANITAN_ZEN_MODE, gMonBackPic_DarmanitanZenMode), - SPECIES_SPRITE(DARMANITAN_ZEN_MODE_GALARIAN, gMonBackPic_DarmanitanZenModeGalarian), + SPECIES_SPRITE(DARMANITAN_GALARIAN_ZEN_MODE, gMonBackPic_DarmanitanGalarianZenMode), SPECIES_SPRITE(DEERLING_SUMMER, gMonBackPic_Deerling), SPECIES_SPRITE(DEERLING_AUTUMN, gMonBackPic_Deerling), @@ -1234,7 +1234,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ZYGARDE_10, gMonBackPic_Zygarde10), SPECIES_SPRITE(ZYGARDE_10_POWER_CONSTRUCT, gMonBackPic_Zygarde10), - SPECIES_SPRITE(ZYGARDE_50_POWER_CONSTRUCT, gMonBackPic_Zygarde), + SPECIES_SPRITE(ZYGARDE_50_POWER_CONSTRUCT, gMonBackPic_Zygarde50), SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonBackPic_ZygardeComplete), SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound), @@ -1270,12 +1270,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(SILVALLY_DARK, gMonBackPic_Silvally), SPECIES_SPRITE(SILVALLY_FAIRY, gMonBackPic_Silvally), - SPECIES_SPRITE(MINIOR_METEOR_ORANGE, gMonBackPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_YELLOW, gMonBackPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_GREEN, gMonBackPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_BLUE, gMonBackPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_INDIGO, gMonBackPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_VIOLET, gMonBackPic_Minior), + SPECIES_SPRITE(MINIOR_METEOR_ORANGE, gMonBackPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_YELLOW, gMonBackPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_GREEN, gMonBackPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_BLUE, gMonBackPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_INDIGO, gMonBackPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_VIOLET, gMonBackPic_MiniorMeteor), SPECIES_SPRITE(MINIOR_CORE_RED, gMonBackPic_MiniorCore), SPECIES_SPRITE(MINIOR_CORE_ORANGE, gMonBackPic_MiniorCore), SPECIES_SPRITE(MINIOR_CORE_YELLOW, gMonBackPic_MiniorCore), @@ -1368,7 +1368,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ALCREMIE_GIGANTAMAX, gMonBackPic_AlcremieGigantamax), SPECIES_SPRITE(COPPERAJAH_GIGANTAMAX, gMonBackPic_CopperajahGigantamax), SPECIES_SPRITE(DURALUDON_GIGANTAMAX, gMonBackPic_DuraludonGigantamax), - SPECIES_SPRITE(URSHIFU_GIGANTAMAX, gMonBackPic_UrshifuGigantamax), + SPECIES_SPRITE(URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX, gMonBackPic_UrshifuSingleStrikeGigantamax), SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, gMonBackPic_UrshifuRapidStrikeGigantamax), #endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 436e7e1dd7..9f80b98a3a 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -51,7 +51,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_DUSKULL] = 13, [SPECIES_SHUPPET] = 14, [SPECIES_BANETTE] = 8, - [SPECIES_CASTFORM] = 16, + [SPECIES_CASTFORM_NORMAL] = 16, [SPECIES_BELDUM] = 8, [SPECIES_RAYQUAZA] = 6, [SPECIES_LATIAS] = 12, @@ -99,19 +99,19 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_BRAVIARY] = 8, [SPECIES_HYDREIGON] = 3, [SPECIES_VOLCARONA] = 6, - [SPECIES_TORNADUS] = 7, - [SPECIES_THUNDURUS] = 7, - [SPECIES_LANDORUS] = 7, - [SPECIES_MELOETTA] = 8, + [SPECIES_TORNADUS_INCARNATE] = 7, + [SPECIES_THUNDURUS_INCARNATE] = 7, + [SPECIES_LANDORUS_INCARNATE] = 7, + [SPECIES_MELOETTA_ARIA] = 8, // Gen 6 [SPECIES_FLETCHINDER] = 9, [SPECIES_TALONFLAME] = 7, - [SPECIES_VIVILLON] = 9, - [SPECIES_FLABEBE] = 6, - [SPECIES_FLOETTE] = 4, + [SPECIES_VIVILLON_ICY_SNOW] = 9, + [SPECIES_FLABEBE_RED_FLOWER] = 6, + [SPECIES_FLOETTE_RED_FLOWER] = 4, [SPECIES_HONEDGE] = 4, [SPECIES_DOUBLADE] = 5, - [SPECIES_AEGISLASH] = 3, + [SPECIES_AEGISLASH_SHIELD] = 3, [SPECIES_SPRITZEE] = 14, [SPECIES_INKAY] = 14, [SPECIES_CARBINK] = 4, @@ -119,13 +119,13 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_PHANTUMP] = 5, [SPECIES_NOIBAT] = 8, [SPECIES_YVELTAL] = 5, - [SPECIES_HOOPA] = 13, + [SPECIES_HOOPA_CONFINED] = 13, // Gen 7 [SPECIES_VIKAVOLT] = 8, [SPECIES_CUTIEFLY] = 10, [SPECIES_RIBOMBEE] = 6, [SPECIES_COMFEY] = 8, - [SPECIES_MINIOR] = 17, + [SPECIES_MINIOR_METEOR_RED] = 17, [SPECIES_DHELMISE] = 2, [SPECIES_TAPU_KOKO] = 9, [SPECIES_TAPU_LELE] = 8, @@ -143,8 +143,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_CORVISQUIRE] = 10, [SPECIES_ORBEETLE] = 8, [SPECIES_FLAPPLE] = 9, - [SPECIES_SINISTEA] = 9, - [SPECIES_POLTEAGEIST] = 11, + [SPECIES_SINISTEA_PHONY] = 9, + [SPECIES_POLTEAGEIST_PHONY] = 11, [SPECIES_RUNERIGUS] = 5, [SPECIES_MILCERY] = 10, [SPECIES_FROSMOTH] = 7, diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index 38737ac439..67e88c6d3d 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -360,7 +360,7 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_ARON] = gMonFootprint_Aron, [SPECIES_LAIRON] = gMonFootprint_Lairon, [SPECIES_AGGRON] = gMonFootprint_Aggron, - [SPECIES_CASTFORM] = gMonFootprint_Castform, + [SPECIES_CASTFORM_NORMAL] = gMonFootprint_Castform, [SPECIES_VOLBEAT] = gMonFootprint_Volbeat, [SPECIES_ILLUMISE] = gMonFootprint_Illumise, [SPECIES_LILEEP] = gMonFootprint_Lileep, @@ -385,7 +385,7 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_LATIAS] = gMonFootprint_Latias, [SPECIES_LATIOS] = gMonFootprint_Latios, [SPECIES_JIRACHI] = gMonFootprint_Jirachi, - [SPECIES_DEOXYS] = gMonFootprint_Deoxys, + [SPECIES_DEOXYS_NORMAL] = gMonFootprint_Deoxys, [SPECIES_CHIMECHO] = gMonFootprint_Chimecho, #if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = gMonFootprint_Turtwig, @@ -413,8 +413,8 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_RAMPARDOS] = gMonFootprint_Rampardos, [SPECIES_SHIELDON] = gMonFootprint_Shieldon, [SPECIES_BASTIODON] = gMonFootprint_Bastiodon, - [SPECIES_BURMY] = gMonFootprint_Burmy, - [SPECIES_WORMADAM] = gMonFootprint_Wormadam, + [SPECIES_BURMY_PLANT_CLOAK] = gMonFootprint_Burmy, + [SPECIES_WORMADAM_PLANT_CLOAK] = gMonFootprint_Wormadam, [SPECIES_MOTHIM] = gMonFootprint_Mothim, [SPECIES_COMBEE] = gMonFootprint_Combee, [SPECIES_VESPIQUEN] = gMonFootprint_Vespiquen, @@ -422,9 +422,9 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_BUIZEL] = gMonFootprint_Buizel, [SPECIES_FLOATZEL] = gMonFootprint_Floatzel, [SPECIES_CHERUBI] = gMonFootprint_Cherubi, - [SPECIES_CHERRIM] = gMonFootprint_Cherrim, - [SPECIES_SHELLOS] = gMonFootprint_Shellos, - [SPECIES_GASTRODON] = gMonFootprint_Gastrodon, + [SPECIES_CHERRIM_OVERCAST] = gMonFootprint_Cherrim, + [SPECIES_SHELLOS_WEST_SEA] = gMonFootprint_Shellos, + [SPECIES_GASTRODON_WEST_SEA] = gMonFootprint_Gastrodon, [SPECIES_AMBIPOM] = gMonFootprint_Ambipom, [SPECIES_DRIFLOON] = gMonFootprint_Drifloon, [SPECIES_DRIFBLIM] = gMonFootprint_Drifblim, @@ -488,13 +488,13 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_PALKIA] = gMonFootprint_Palkia, [SPECIES_HEATRAN] = gMonFootprint_Heatran, [SPECIES_REGIGIGAS] = gMonFootprint_Regigigas, - [SPECIES_GIRATINA] = gMonFootprint_Giratina, + [SPECIES_GIRATINA_ALTERED] = gMonFootprint_Giratina, [SPECIES_CRESSELIA] = gMonFootprint_Cresselia, [SPECIES_PHIONE] = gMonFootprint_Phione, [SPECIES_MANAPHY] = gMonFootprint_Manaphy, [SPECIES_DARKRAI] = gMonFootprint_Darkrai, - [SPECIES_SHAYMIN] = gMonFootprint_Shaymin, - [SPECIES_ARCEUS] = gMonFootprint_Arceus, + [SPECIES_SHAYMIN_LAND] = gMonFootprint_Shaymin, + [SPECIES_ARCEUS_NORMAL] = gMonFootprint_Arceus, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = gMonFootprint_Victini, @@ -553,12 +553,12 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_WHIMSICOTT] = gMonFootprint_Whimsicott, [SPECIES_PETILIL] = gMonFootprint_Petilil, [SPECIES_LILLIGANT] = gMonFootprint_Lilligant, - [SPECIES_BASCULIN] = gMonFootprint_Basculin, + [SPECIES_BASCULIN_RED_STRIPED] = gMonFootprint_Basculin, [SPECIES_SANDILE] = gMonFootprint_Sandile, [SPECIES_KROKOROK] = gMonFootprint_Krokorok, [SPECIES_KROOKODILE] = gMonFootprint_Krookodile, [SPECIES_DARUMAKA] = gMonFootprint_Darumaka, - [SPECIES_DARMANITAN] = gMonFootprint_Darmanitan, + [SPECIES_DARMANITAN_STANDARD_MODE] = gMonFootprint_Darmanitan, [SPECIES_MARACTUS] = gMonFootprint_Maractus, [SPECIES_DWEBBLE] = gMonFootprint_Dwebble, [SPECIES_CRUSTLE] = gMonFootprint_Crustle, @@ -588,8 +588,8 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_VANILLITE] = gMonFootprint_Vanillite, [SPECIES_VANILLISH] = gMonFootprint_Vanillish, [SPECIES_VANILLUXE] = gMonFootprint_Vanilluxe, - [SPECIES_DEERLING] = gMonFootprint_Deerling, - [SPECIES_SAWSBUCK] = gMonFootprint_Sawsbuck, + [SPECIES_DEERLING_SPRING] = gMonFootprint_Deerling, + [SPECIES_SAWSBUCK_SPRING] = gMonFootprint_Sawsbuck, [SPECIES_EMOLGA] = gMonFootprint_Emolga, [SPECIES_KARRABLAST] = gMonFootprint_Karrablast, [SPECIES_ESCAVALIER] = gMonFootprint_Escavalier, @@ -644,14 +644,14 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_COBALION] = gMonFootprint_Cobalion, [SPECIES_TERRAKION] = gMonFootprint_Terrakion, [SPECIES_VIRIZION] = gMonFootprint_Virizion, - [SPECIES_TORNADUS] = gMonFootprint_Tornadus, - [SPECIES_THUNDURUS] = gMonFootprint_Thundurus, + [SPECIES_TORNADUS_INCARNATE] = gMonFootprint_Tornadus, + [SPECIES_THUNDURUS_INCARNATE] = gMonFootprint_Thundurus, [SPECIES_RESHIRAM] = gMonFootprint_Reshiram, [SPECIES_ZEKROM] = gMonFootprint_Zekrom, - [SPECIES_LANDORUS] = gMonFootprint_Landorus, + [SPECIES_LANDORUS_INCARNATE] = gMonFootprint_Landorus, [SPECIES_KYUREM] = gMonFootprint_Kyurem, - [SPECIES_KELDEO] = gMonFootprint_Keldeo, - [SPECIES_MELOETTA] = gMonFootprint_Meloetta, + [SPECIES_KELDEO_ORDINARY] = gMonFootprint_Keldeo, + [SPECIES_MELOETTA_ARIA] = gMonFootprint_Meloetta, [SPECIES_GENESECT] = gMonFootprint_Genesect, #endif #if P_GEN_6_POKEMON == TRUE @@ -671,22 +671,22 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_TALONFLAME] = gMonFootprint_Talonflame, [SPECIES_SCATTERBUG] = gMonFootprint_Scatterbug, [SPECIES_SPEWPA] = gMonFootprint_Spewpa, - [SPECIES_VIVILLON] = gMonFootprint_Vivillon, + [SPECIES_VIVILLON_ICY_SNOW] = gMonFootprint_Vivillon, [SPECIES_LITLEO] = gMonFootprint_Litleo, [SPECIES_PYROAR] = gMonFootprint_Pyroar, - [SPECIES_FLABEBE] = gMonFootprint_Flabebe, - [SPECIES_FLOETTE] = gMonFootprint_Floette, - [SPECIES_FLORGES] = gMonFootprint_Florges, + [SPECIES_FLABEBE_RED_FLOWER] = gMonFootprint_Flabebe, + [SPECIES_FLOETTE_RED_FLOWER] = gMonFootprint_Floette, + [SPECIES_FLORGES_RED_FLOWER] = gMonFootprint_Florges, [SPECIES_SKIDDO] = gMonFootprint_Skiddo, [SPECIES_GOGOAT] = gMonFootprint_Gogoat, [SPECIES_PANCHAM] = gMonFootprint_Pancham, [SPECIES_PANGORO] = gMonFootprint_Pangoro, - [SPECIES_FURFROU] = gMonFootprint_Furfrou, + [SPECIES_FURFROU_NATURAL] = gMonFootprint_Furfrou, [SPECIES_ESPURR] = gMonFootprint_Espurr, - [SPECIES_MEOWSTIC] = gMonFootprint_Meowstic, + [SPECIES_MEOWSTIC_MALE] = gMonFootprint_Meowstic, [SPECIES_HONEDGE] = gMonFootprint_Honedge, [SPECIES_DOUBLADE] = gMonFootprint_Doublade, - [SPECIES_AEGISLASH] = gMonFootprint_Aegislash, + [SPECIES_AEGISLASH_SHIELD] = gMonFootprint_Aegislash, [SPECIES_SPRITZEE] = gMonFootprint_Spritzee, [SPECIES_AROMATISSE] = gMonFootprint_Aromatisse, [SPECIES_SWIRLIX] = gMonFootprint_Swirlix, @@ -715,17 +715,17 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_KLEFKI] = gMonFootprint_Klefki, [SPECIES_PHANTUMP] = gMonFootprint_Phantump, [SPECIES_TREVENANT] = gMonFootprint_Trevenant, - [SPECIES_PUMPKABOO] = gMonFootprint_Pumpkaboo, - [SPECIES_GOURGEIST] = gMonFootprint_Gourgeist, + [SPECIES_PUMPKABOO_AVERAGE] = gMonFootprint_Pumpkaboo, + [SPECIES_GOURGEIST_AVERAGE] = gMonFootprint_Gourgeist, [SPECIES_BERGMITE] = gMonFootprint_Bergmite, [SPECIES_AVALUGG] = gMonFootprint_Avalugg, [SPECIES_NOIBAT] = gMonFootprint_Noibat, [SPECIES_NOIVERN] = gMonFootprint_Noivern, - [SPECIES_XERNEAS] = gMonFootprint_Xerneas, + [SPECIES_XERNEAS_NEUTRAL] = gMonFootprint_Xerneas, [SPECIES_YVELTAL] = gMonFootprint_Yveltal, - [SPECIES_ZYGARDE] = gMonFootprint_Zygarde, + [SPECIES_ZYGARDE_50_AURA_BREAK] = gMonFootprint_Zygarde, [SPECIES_DIANCIE] = gMonFootprint_Diancie, - [SPECIES_HOOPA] = gMonFootprint_Hoopa, + [SPECIES_HOOPA_CONFINED] = gMonFootprint_Hoopa, [SPECIES_VOLCANION] = gMonFootprint_Volcanion, #endif #if P_GEN_7_POKEMON == TRUE @@ -748,12 +748,12 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_VIKAVOLT] = gMonFootprint_Vikavolt, [SPECIES_CRABRAWLER] = gMonFootprint_Crabrawler, [SPECIES_CRABOMINABLE] = gMonFootprint_Crabominable, - [SPECIES_ORICORIO] = gMonFootprint_Oricorio, + [SPECIES_ORICORIO_BAILE] = gMonFootprint_Oricorio, [SPECIES_CUTIEFLY] = gMonFootprint_Cutiefly, [SPECIES_RIBOMBEE] = gMonFootprint_Ribombee, [SPECIES_ROCKRUFF] = gMonFootprint_Rockruff, - [SPECIES_LYCANROC] = gMonFootprint_Lycanroc, - [SPECIES_WISHIWASHI] = gMonFootprint_Wishiwashi, + [SPECIES_LYCANROC_MIDDAY] = gMonFootprint_Lycanroc, + [SPECIES_WISHIWASHI_SOLO] = gMonFootprint_Wishiwashi, [SPECIES_MAREANIE] = gMonFootprint_Mareanie, [SPECIES_TOXAPEX] = gMonFootprint_Toxapex, [SPECIES_MUDBRAY] = gMonFootprint_Mudbray, @@ -780,12 +780,12 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_PALOSSAND] = gMonFootprint_Palossand, [SPECIES_PYUKUMUKU] = gMonFootprint_Pyukumuku, [SPECIES_TYPE_NULL] = gMonFootprint_Type_Null, - [SPECIES_SILVALLY] = gMonFootprint_Silvally, - [SPECIES_MINIOR] = gMonFootprint_Minior, + [SPECIES_SILVALLY_NORMAL] = gMonFootprint_Silvally, + [SPECIES_MINIOR_METEOR_RED] = gMonFootprint_Minior, [SPECIES_KOMALA] = gMonFootprint_Komala, [SPECIES_TURTONATOR] = gMonFootprint_Turtonator, [SPECIES_TOGEDEMARU] = gMonFootprint_Togedemaru, - [SPECIES_MIMIKYU] = gMonFootprint_Mimikyu, + [SPECIES_MIMIKYU_DISGUISED] = gMonFootprint_Mimikyu, [SPECIES_BRUXISH] = gMonFootprint_Bruxish, [SPECIES_DRAMPA] = gMonFootprint_Drampa, [SPECIES_DHELMISE] = gMonFootprint_Dhelmise, @@ -858,13 +858,13 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_ARROKUDA] = gMonFootprint_Arrokuda, [SPECIES_BARRASKEWDA] = gMonFootprint_Barraskewda, [SPECIES_TOXEL] = gMonFootprint_Toxel, - [SPECIES_TOXTRICITY] = gMonFootprint_Toxtricity, + [SPECIES_TOXTRICITY_AMPED] = gMonFootprint_Toxtricity, [SPECIES_SIZZLIPEDE] = gMonFootprint_Sizzlipede, [SPECIES_CENTISKORCH] = gMonFootprint_Centiskorch, [SPECIES_CLOBBOPUS] = gMonFootprint_Clobbopus, [SPECIES_GRAPPLOCT] = gMonFootprint_Grapploct, - [SPECIES_SINISTEA] = gMonFootprint_Sinistea, - [SPECIES_POLTEAGEIST] = gMonFootprint_Polteageist, + [SPECIES_SINISTEA_PHONY] = gMonFootprint_Sinistea, + [SPECIES_POLTEAGEIST_PHONY] = gMonFootprint_Polteageist, [SPECIES_HATENNA] = gMonFootprint_Hatenna, [SPECIES_HATTREM] = gMonFootprint_Hattrem, [SPECIES_HATTERENE] = gMonFootprint_Hatterene, @@ -878,15 +878,15 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_MR_RIME] = gMonFootprint_Mr_Rime, [SPECIES_RUNERIGUS] = gMonFootprint_Runerigus, [SPECIES_MILCERY] = gMonFootprint_Milcery, - [SPECIES_ALCREMIE] = gMonFootprint_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = gMonFootprint_Alcremie, [SPECIES_FALINKS] = gMonFootprint_Falinks, [SPECIES_PINCURCHIN] = gMonFootprint_Pincurchin, [SPECIES_SNOM] = gMonFootprint_Snom, [SPECIES_FROSMOTH] = gMonFootprint_Frosmoth, [SPECIES_STONJOURNER] = gMonFootprint_Stonjourner, - [SPECIES_EISCUE] = gMonFootprint_Eiscue, - [SPECIES_INDEEDEE] = gMonFootprint_Indeedee, - [SPECIES_MORPEKO] = gMonFootprint_Morpeko, + [SPECIES_EISCUE_ICE_FACE] = gMonFootprint_Eiscue, + [SPECIES_INDEEDEE_MALE] = gMonFootprint_Indeedee, + [SPECIES_MORPEKO_FULL_BELLY] = gMonFootprint_Morpeko, [SPECIES_CUFANT] = gMonFootprint_Cufant, [SPECIES_COPPERAJAH] = gMonFootprint_Copperajah, [SPECIES_DRACOZOLT] = gMonFootprint_Dracozolt, @@ -897,11 +897,11 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_DREEPY] = gMonFootprint_Dreepy, [SPECIES_DRAKLOAK] = gMonFootprint_Drakloak, [SPECIES_DRAGAPULT] = gMonFootprint_Dragapult, - [SPECIES_ZACIAN] = gMonFootprint_Zacian, - [SPECIES_ZAMAZENTA] = gMonFootprint_Zamazenta, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = gMonFootprint_Zacian, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = gMonFootprint_Zamazenta, [SPECIES_ETERNATUS] = gMonFootprint_Eternatus, [SPECIES_KUBFU] = gMonFootprint_Kubfu, - [SPECIES_URSHIFU] = gMonFootprint_Urshifu, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = gMonFootprint_Urshifu, [SPECIES_ZARUDE] = gMonFootprint_Zarude, [SPECIES_REGIELEKI] = gMonFootprint_Regieleki, [SPECIES_REGIDRAGO] = gMonFootprint_Regidrago, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 130dcad60a..cc2fae2884 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -4131,7 +4131,7 @@ static const union AnimCmd sAnim_Aggron_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Castform_1[] = +static const union AnimCmd sAnim_CastformNormal_1[] = { ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 24), @@ -4490,7 +4490,7 @@ static const union AnimCmd sAnim_Jirachi_2[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Deoxys_1[] = +static const union AnimCmd sAnim_DeoxysNormal_1[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_FRAME(1, 16), @@ -4500,15 +4500,6 @@ static const union AnimCmd sAnim_Deoxys_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Deoxys_2[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(2, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(2, 20), - ANIMCMD_END, -}; - static const union AnimCmd sAnim_Chimecho_1[] = { ANIMCMD_FRAME(0, 15), @@ -5894,7 +5885,7 @@ static const union AnimCmd sAnim_Regigigas_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Giratina_1[] = +static const union AnimCmd sAnim_GiratinaAltered_1[] = { ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 45), @@ -5937,7 +5928,7 @@ static const union AnimCmd sAnim_Darkrai_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Shaymin_1[] = +static const union AnimCmd sAnim_ShayminLand_1[] = { ANIMCMD_FRAME(0, 20), ANIMCMD_FRAME(1, 10), @@ -6606,7 +6597,7 @@ static const union AnimCmd sAnim_Darumaka_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Darmanitan_1[] = +static const union AnimCmd sAnim_DarmanitanStandardMode_1[] = { ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(0, 10), @@ -7480,7 +7471,7 @@ static const union AnimCmd sAnim_Virizion_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Tornadus_1[] = +static const union AnimCmd sAnim_TornadusIncarnate_1[] = { ANIMCMD_FRAME(1, 2), ANIMCMD_FRAME(0, 2), @@ -7507,7 +7498,7 @@ static const union AnimCmd sAnim_Tornadus_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Thundurus_1[] = +static const union AnimCmd sAnim_ThundurusIncarnate_1[] = { ANIMCMD_FRAME(1, 2), ANIMCMD_FRAME(0, 2), @@ -7548,7 +7539,7 @@ static const union AnimCmd sAnim_Zekrom_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Landorus_1[] = +static const union AnimCmd sAnim_LandorusIncarnate_1[] = { ANIMCMD_FRAME(1, 2), ANIMCMD_FRAME(0, 2), @@ -7584,14 +7575,14 @@ static const union AnimCmd sAnim_Kyurem_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Keldeo_1[] = +static const union AnimCmd sAnim_KeldeoOrdinary_1[] = { ANIMCMD_FRAME(1, 32), ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; -static const union AnimCmd sAnim_Meloetta_1[] = +static const union AnimCmd sAnim_MeloettaAria_1[] = { ANIMCMD_FRAME(0, 15), ANIMCMD_FRAME(1, 45), @@ -7603,7 +7594,7 @@ static const union AnimCmd sAnim_Meloetta_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Meloetta_2[] = +static const union AnimCmd sAnim_MeloettaAria_2[] = { ANIMCMD_FRAME(0, 20), ANIMCMD_FRAME(2, 20), @@ -7985,7 +7976,7 @@ static const union AnimCmd sAnim_Doublade_2[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Aegislash_1[] = +static const union AnimCmd sAnim_AegislashShield_1[] = { ANIMCMD_FRAME(0, 18), ANIMCMD_FRAME(1, 18), @@ -8340,7 +8331,7 @@ static const union AnimCmd sAnim_Yveltal_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Zygarde_1[] = +static const union AnimCmd sAnim_Zygarde50_1[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 25), @@ -8526,13 +8517,13 @@ static const union AnimCmd sAnim_Rockruff_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Lycanroc_1[] = +static const union AnimCmd sAnim_LycanrocMidday_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_Wishiwashi_1[] = +static const union AnimCmd sAnim_WishiwashiSolo_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -8721,7 +8712,7 @@ static const union AnimCmd sAnim_Silvally_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Minior_1[] = +static const union AnimCmd sAnim_MiniorMeteor_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -8747,7 +8738,7 @@ static const union AnimCmd sAnim_Togedemaru_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Mimikyu_1[] = +static const union AnimCmd sAnim_MimikyuDisguised_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -9523,7 +9514,7 @@ static const union AnimCmd sAnim_Overqwil_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Enamorus_1[] = +static const union AnimCmd sAnim_EnamorusIncarnate_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -10035,7 +10026,7 @@ static const union AnimCmd sAnim_DarumakaGalarian_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_DarmanitanGalarian_1[] = +static const union AnimCmd sAnim_DarmanitanGalarianStandardMode_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -10343,7 +10334,7 @@ static const union AnimCmd sAnim_DuraludonGigantamax_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_UrshifuGigantamax_1[] = +static const union AnimCmd sAnim_UrshifuSingleStrikeStyleGigantamax_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -10550,7 +10541,7 @@ static const union AnimCmd sAnim_DarmanitanZenMode_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_DarmanitanZenModeGalarian_1[] = +static const union AnimCmd sAnim_DarmanitanGalarianZenMode_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -11086,7 +11077,7 @@ SINGLE_ANIMATION(Relicanth); SINGLE_ANIMATION(Aron); SINGLE_ANIMATION(Lairon); SINGLE_ANIMATION(Aggron); -SINGLE_ANIMATION(Castform); +SINGLE_ANIMATION(CastformNormal); SINGLE_ANIMATION(CastformSunny); SINGLE_ANIMATION(CastformRainy); SINGLE_ANIMATION(CastformSnowy); @@ -11114,7 +11105,7 @@ DOUBLE_ANIMATION(Rayquaza); DOUBLE_ANIMATION(Latias); DOUBLE_ANIMATION(Latios); DOUBLE_ANIMATION(Jirachi); -DOUBLE_ANIMATION(Deoxys); +SINGLE_ANIMATION(DeoxysNormal); SINGLE_ANIMATION(Chimecho); SINGLE_ANIMATION(Egg); SINGLE_ANIMATION(UnownB); @@ -11251,12 +11242,12 @@ SINGLE_ANIMATION(Dialga); SINGLE_ANIMATION(Palkia); SINGLE_ANIMATION(Heatran); SINGLE_ANIMATION(Regigigas); -SINGLE_ANIMATION(Giratina); +SINGLE_ANIMATION(GiratinaAltered); SINGLE_ANIMATION(Cresselia); SINGLE_ANIMATION(Phione); SINGLE_ANIMATION(Manaphy); SINGLE_ANIMATION(Darkrai); -SINGLE_ANIMATION(Shaymin); +SINGLE_ANIMATION(ShayminLand); SINGLE_ANIMATION(Arceus); #endif #if P_GEN_5_POKEMON == TRUE @@ -11321,7 +11312,7 @@ SINGLE_ANIMATION(Sandile); SINGLE_ANIMATION(Krokorok); DOUBLE_ANIMATION(Krookodile); SINGLE_ANIMATION(Darumaka); -SINGLE_ANIMATION(Darmanitan); +SINGLE_ANIMATION(DarmanitanStandardMode); SINGLE_ANIMATION(Maractus); SINGLE_ANIMATION(Dwebble); SINGLE_ANIMATION(Crustle); @@ -11407,14 +11398,14 @@ SINGLE_ANIMATION(Volcarona); SINGLE_ANIMATION(Cobalion); DOUBLE_ANIMATION(Terrakion); SINGLE_ANIMATION(Virizion); -SINGLE_ANIMATION(Tornadus); -SINGLE_ANIMATION(Thundurus); +SINGLE_ANIMATION(TornadusIncarnate); +SINGLE_ANIMATION(ThundurusIncarnate); SINGLE_ANIMATION(Reshiram); SINGLE_ANIMATION(Zekrom); -SINGLE_ANIMATION(Landorus); +SINGLE_ANIMATION(LandorusIncarnate); SINGLE_ANIMATION(Kyurem); -SINGLE_ANIMATION(Keldeo); -DOUBLE_ANIMATION(Meloetta); +SINGLE_ANIMATION(KeldeoOrdinary); +DOUBLE_ANIMATION(MeloettaAria); SINGLE_ANIMATION(Genesect); #endif #if P_GEN_6_POKEMON == TRUE @@ -11450,7 +11441,7 @@ SINGLE_ANIMATION(Espurr); SINGLE_ANIMATION(Meowstic); SINGLE_ANIMATION(Honedge); DOUBLE_ANIMATION(Doublade); -SINGLE_ANIMATION(Aegislash); +SINGLE_ANIMATION(AegislashShield); SINGLE_ANIMATION(Spritzee); SINGLE_ANIMATION(Aromatisse); SINGLE_ANIMATION(Swirlix); @@ -11487,7 +11478,7 @@ SINGLE_ANIMATION(Noibat); SINGLE_ANIMATION(Noivern); SINGLE_ANIMATION(Xerneas); SINGLE_ANIMATION(Yveltal); -SINGLE_ANIMATION(Zygarde); +SINGLE_ANIMATION(Zygarde50); SINGLE_ANIMATION(Diancie); SINGLE_ANIMATION(Hoopa); SINGLE_ANIMATION(Volcanion); @@ -11516,8 +11507,8 @@ SINGLE_ANIMATION(Oricorio); SINGLE_ANIMATION(Cutiefly); SINGLE_ANIMATION(Ribombee); SINGLE_ANIMATION(Rockruff); -SINGLE_ANIMATION(Lycanroc); -SINGLE_ANIMATION(Wishiwashi); +SINGLE_ANIMATION(LycanrocMidday); +SINGLE_ANIMATION(WishiwashiSolo); SINGLE_ANIMATION(Mareanie); SINGLE_ANIMATION(Toxapex); SINGLE_ANIMATION(Mudbray); @@ -11545,11 +11536,11 @@ SINGLE_ANIMATION(Palossand); SINGLE_ANIMATION(Pyukumuku); SINGLE_ANIMATION(TypeNull); SINGLE_ANIMATION(Silvally); -SINGLE_ANIMATION(Minior); +SINGLE_ANIMATION(MiniorMeteor); SINGLE_ANIMATION(Komala); SINGLE_ANIMATION(Turtonator); SINGLE_ANIMATION(Togedemaru); -SINGLE_ANIMATION(Mimikyu); +SINGLE_ANIMATION(MimikyuDisguised); SINGLE_ANIMATION(Bruxish); SINGLE_ANIMATION(Drampa); SINGLE_ANIMATION(Dhelmise); @@ -11678,7 +11669,7 @@ SINGLE_ANIMATION(Ursaluna); SINGLE_ANIMATION(Basculegion); SINGLE_ANIMATION(Sneasler); SINGLE_ANIMATION(Overqwil); -SINGLE_ANIMATION(Enamorus); +SINGLE_ANIMATION(EnamorusIncarnate); #endif SINGLE_ANIMATION(VenusaurMega); SINGLE_ANIMATION(CHARIZARD_MEGA_X); @@ -11771,7 +11762,7 @@ SINGLE_ANIMATION(ZigzagoonGalarian); SINGLE_ANIMATION(LinooneGalarian); #if P_GEN_5_POKEMON == TRUE SINGLE_ANIMATION(DarumakaGalarian); -SINGLE_ANIMATION(DarmanitanGalarian); +SINGLE_ANIMATION(DarmanitanGalarianStandardMode); SINGLE_ANIMATION(YamaskGalarian); SINGLE_ANIMATION(StunfiskGalarian); #endif @@ -11823,7 +11814,7 @@ SINGLE_ANIMATION(ShayminSky); #endif #if P_GEN_5_POKEMON == TRUE SINGLE_ANIMATION(DarmanitanZenMode); -SINGLE_ANIMATION(DarmanitanZenModeGalarian); +SINGLE_ANIMATION(DarmanitanGalarianZenMode); SINGLE_ANIMATION(TornadusTherian); SINGLE_ANIMATION(ThundurusTherian); SINGLE_ANIMATION(LandorusTherian); @@ -11885,7 +11876,7 @@ SINGLE_ANIMATION(GrimmsnarlGigantamax); SINGLE_ANIMATION(AlcremieGigantamax); SINGLE_ANIMATION(CopperajahGigantamax); SINGLE_ANIMATION(DuraludonGigantamax); -SINGLE_ANIMATION(UrshifuGigantamax); +SINGLE_ANIMATION(UrshifuSingleStrikeStyleGigantamax); SINGLE_ANIMATION(UrshifuRapidStrikeStyleGigantamax); #endif @@ -12253,7 +12244,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_ARON] = sAnims_Aron, [SPECIES_LAIRON] = sAnims_Lairon, [SPECIES_AGGRON] = sAnims_Aggron, - [SPECIES_CASTFORM] = sAnims_Castform, + [SPECIES_CASTFORM_NORMAL] = sAnims_CastformNormal, [SPECIES_VOLBEAT] = sAnims_Volbeat, [SPECIES_ILLUMISE] = sAnims_Illumise, [SPECIES_LILEEP] = sAnims_Lileep, @@ -12278,7 +12269,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_LATIAS] = sAnims_Latias, [SPECIES_LATIOS] = sAnims_Latios, [SPECIES_JIRACHI] = sAnims_Jirachi, - [SPECIES_DEOXYS] = sAnims_Deoxys, + [SPECIES_DEOXYS_NORMAL] = sAnims_DeoxysNormal, [SPECIES_CHIMECHO] = sAnims_Chimecho, #if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = sAnims_Turtwig, @@ -12306,8 +12297,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_RAMPARDOS] = sAnims_Rampardos, [SPECIES_SHIELDON] = sAnims_Shieldon, [SPECIES_BASTIODON] = sAnims_Bastiodon, - [SPECIES_BURMY] = sAnims_Burmy, - [SPECIES_WORMADAM] = sAnims_Wormadam, + [SPECIES_BURMY_PLANT_CLOAK] = sAnims_Burmy, + [SPECIES_WORMADAM_PLANT_CLOAK] = sAnims_Wormadam, [SPECIES_MOTHIM] = sAnims_Mothim, [SPECIES_COMBEE] = sAnims_Combee, [SPECIES_VESPIQUEN] = sAnims_Vespiquen, @@ -12315,9 +12306,9 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_BUIZEL] = sAnims_Buizel, [SPECIES_FLOATZEL] = sAnims_Floatzel, [SPECIES_CHERUBI] = sAnims_Cherubi, - [SPECIES_CHERRIM] = sAnims_CherrimOvercast, - [SPECIES_SHELLOS] = sAnims_Shellos, - [SPECIES_GASTRODON] = sAnims_Gastrodon, + [SPECIES_CHERRIM_OVERCAST] = sAnims_CherrimOvercast, + [SPECIES_SHELLOS_WEST_SEA] = sAnims_Shellos, + [SPECIES_GASTRODON_WEST_SEA] = sAnims_Gastrodon, [SPECIES_AMBIPOM] = sAnims_Ambipom, [SPECIES_DRIFLOON] = sAnims_Drifloon, [SPECIES_DRIFBLIM] = sAnims_Drifblim, @@ -12381,13 +12372,13 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_PALKIA] = sAnims_Palkia, [SPECIES_HEATRAN] = sAnims_Heatran, [SPECIES_REGIGIGAS] = sAnims_Regigigas, - [SPECIES_GIRATINA] = sAnims_Giratina, + [SPECIES_GIRATINA_ALTERED] = sAnims_GiratinaAltered, [SPECIES_CRESSELIA] = sAnims_Cresselia, [SPECIES_PHIONE] = sAnims_Phione, [SPECIES_MANAPHY] = sAnims_Manaphy, [SPECIES_DARKRAI] = sAnims_Darkrai, - [SPECIES_SHAYMIN] = sAnims_Shaymin, - [SPECIES_ARCEUS] = sAnims_Arceus, + [SPECIES_SHAYMIN_LAND] = sAnims_ShayminLand, + [SPECIES_ARCEUS_NORMAL] = sAnims_Arceus, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = sAnims_Victini, @@ -12446,12 +12437,12 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_WHIMSICOTT] = sAnims_Whimsicott, [SPECIES_PETILIL] = sAnims_Petilil, [SPECIES_LILLIGANT] = sAnims_Lilligant, - [SPECIES_BASCULIN] = sAnims_Basculin, + [SPECIES_BASCULIN_RED_STRIPED] = sAnims_Basculin, [SPECIES_SANDILE] = sAnims_Sandile, [SPECIES_KROKOROK] = sAnims_Krokorok, [SPECIES_KROOKODILE] = sAnims_Krookodile, [SPECIES_DARUMAKA] = sAnims_Darumaka, - [SPECIES_DARMANITAN] = sAnims_Darmanitan, + [SPECIES_DARMANITAN_STANDARD_MODE] = sAnims_DarmanitanStandardMode, [SPECIES_MARACTUS] = sAnims_Maractus, [SPECIES_DWEBBLE] = sAnims_Dwebble, [SPECIES_CRUSTLE] = sAnims_Crustle, @@ -12481,8 +12472,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_VANILLITE] = sAnims_Vanillite, [SPECIES_VANILLISH] = sAnims_Vanillish, [SPECIES_VANILLUXE] = sAnims_Vanilluxe, - [SPECIES_DEERLING] = sAnims_Deerling, - [SPECIES_SAWSBUCK] = sAnims_Sawsbuck, + [SPECIES_DEERLING_SPRING] = sAnims_Deerling, + [SPECIES_SAWSBUCK_SPRING] = sAnims_Sawsbuck, [SPECIES_EMOLGA] = sAnims_Emolga, [SPECIES_KARRABLAST] = sAnims_Karrablast, [SPECIES_ESCAVALIER] = sAnims_Escavalier, @@ -12537,14 +12528,14 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_COBALION] = sAnims_Cobalion, [SPECIES_TERRAKION] = sAnims_Terrakion, [SPECIES_VIRIZION] = sAnims_Virizion, - [SPECIES_TORNADUS] = sAnims_Tornadus, - [SPECIES_THUNDURUS] = sAnims_Thundurus, + [SPECIES_TORNADUS_INCARNATE] = sAnims_TornadusIncarnate, + [SPECIES_THUNDURUS_INCARNATE] = sAnims_ThundurusIncarnate, [SPECIES_RESHIRAM] = sAnims_Reshiram, [SPECIES_ZEKROM] = sAnims_Zekrom, - [SPECIES_LANDORUS] = sAnims_Landorus, + [SPECIES_LANDORUS_INCARNATE] = sAnims_LandorusIncarnate, [SPECIES_KYUREM] = sAnims_Kyurem, - [SPECIES_KELDEO] = sAnims_Keldeo, - [SPECIES_MELOETTA] = sAnims_Meloetta, + [SPECIES_KELDEO_ORDINARY] = sAnims_KeldeoOrdinary, + [SPECIES_MELOETTA_ARIA] = sAnims_MeloettaAria, [SPECIES_GENESECT] = sAnims_Genesect, #endif #if P_GEN_6_POKEMON == TRUE @@ -12564,22 +12555,22 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_TALONFLAME] = sAnims_Talonflame, [SPECIES_SCATTERBUG] = sAnims_Scatterbug, [SPECIES_SPEWPA] = sAnims_Spewpa, - [SPECIES_VIVILLON] = sAnims_Vivillon, + [SPECIES_VIVILLON_ICY_SNOW] = sAnims_Vivillon, [SPECIES_LITLEO] = sAnims_Litleo, [SPECIES_PYROAR] = sAnims_Pyroar, - [SPECIES_FLABEBE] = sAnims_Flabebe, - [SPECIES_FLOETTE] = sAnims_Floette, - [SPECIES_FLORGES] = sAnims_Florges, + [SPECIES_FLABEBE_RED_FLOWER] = sAnims_Flabebe, + [SPECIES_FLOETTE_RED_FLOWER] = sAnims_Floette, + [SPECIES_FLORGES_RED_FLOWER] = sAnims_Florges, [SPECIES_SKIDDO] = sAnims_Skiddo, [SPECIES_GOGOAT] = sAnims_Gogoat, [SPECIES_PANCHAM] = sAnims_Pancham, [SPECIES_PANGORO] = sAnims_Pangoro, - [SPECIES_FURFROU] = sAnims_Furfrou, + [SPECIES_FURFROU_NATURAL] = sAnims_Furfrou, [SPECIES_ESPURR] = sAnims_Espurr, - [SPECIES_MEOWSTIC] = sAnims_Meowstic, + [SPECIES_MEOWSTIC_MALE] = sAnims_Meowstic, [SPECIES_HONEDGE] = sAnims_Honedge, [SPECIES_DOUBLADE] = sAnims_Doublade, - [SPECIES_AEGISLASH] = sAnims_Aegislash, + [SPECIES_AEGISLASH_SHIELD] = sAnims_AegislashShield, [SPECIES_SPRITZEE] = sAnims_Spritzee, [SPECIES_AROMATISSE] = sAnims_Aromatisse, [SPECIES_SWIRLIX] = sAnims_Swirlix, @@ -12608,17 +12599,17 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_KLEFKI] = sAnims_Klefki, [SPECIES_PHANTUMP] = sAnims_Phantump, [SPECIES_TREVENANT] = sAnims_Trevenant, - [SPECIES_PUMPKABOO] = sAnims_Pumpkaboo, - [SPECIES_GOURGEIST] = sAnims_Gourgeist, + [SPECIES_PUMPKABOO_AVERAGE] = sAnims_Pumpkaboo, + [SPECIES_GOURGEIST_AVERAGE] = sAnims_Gourgeist, [SPECIES_BERGMITE] = sAnims_Bergmite, [SPECIES_AVALUGG] = sAnims_Avalugg, [SPECIES_NOIBAT] = sAnims_Noibat, [SPECIES_NOIVERN] = sAnims_Noivern, - [SPECIES_XERNEAS] = sAnims_Xerneas, + [SPECIES_XERNEAS_NEUTRAL] = sAnims_Xerneas, [SPECIES_YVELTAL] = sAnims_Yveltal, - [SPECIES_ZYGARDE] = sAnims_Zygarde, + [SPECIES_ZYGARDE_50_AURA_BREAK] = sAnims_Zygarde50, [SPECIES_DIANCIE] = sAnims_Diancie, - [SPECIES_HOOPA] = sAnims_Hoopa, + [SPECIES_HOOPA_CONFINED] = sAnims_Hoopa, [SPECIES_VOLCANION] = sAnims_Volcanion, #endif #if P_GEN_7_POKEMON == TRUE @@ -12641,12 +12632,12 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_VIKAVOLT] = sAnims_Vikavolt, [SPECIES_CRABRAWLER] = sAnims_Crabrawler, [SPECIES_CRABOMINABLE] = sAnims_Crabominable, - [SPECIES_ORICORIO] = sAnims_Oricorio, + [SPECIES_ORICORIO_BAILE] = sAnims_Oricorio, [SPECIES_CUTIEFLY] = sAnims_Cutiefly, [SPECIES_RIBOMBEE] = sAnims_Ribombee, [SPECIES_ROCKRUFF] = sAnims_Rockruff, - [SPECIES_LYCANROC] = sAnims_Lycanroc, - [SPECIES_WISHIWASHI] = sAnims_Wishiwashi, + [SPECIES_LYCANROC_MIDDAY] = sAnims_LycanrocMidday, + [SPECIES_WISHIWASHI_SOLO] = sAnims_WishiwashiSolo, [SPECIES_MAREANIE] = sAnims_Mareanie, [SPECIES_TOXAPEX] = sAnims_Toxapex, [SPECIES_MUDBRAY] = sAnims_Mudbray, @@ -12673,12 +12664,12 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_PALOSSAND] = sAnims_Palossand, [SPECIES_PYUKUMUKU] = sAnims_Pyukumuku, [SPECIES_TYPE_NULL] = sAnims_TypeNull, - [SPECIES_SILVALLY] = sAnims_Silvally, - [SPECIES_MINIOR] = sAnims_Minior, + [SPECIES_SILVALLY_NORMAL] = sAnims_Silvally, + [SPECIES_MINIOR_METEOR_RED] = sAnims_MiniorMeteor, [SPECIES_KOMALA] = sAnims_Komala, [SPECIES_TURTONATOR] = sAnims_Turtonator, [SPECIES_TOGEDEMARU] = sAnims_Togedemaru, - [SPECIES_MIMIKYU] = sAnims_Mimikyu, + [SPECIES_MIMIKYU_DISGUISED] = sAnims_MimikyuDisguised, [SPECIES_BRUXISH] = sAnims_Bruxish, [SPECIES_DRAMPA] = sAnims_Drampa, [SPECIES_DHELMISE] = sAnims_Dhelmise, @@ -12751,13 +12742,13 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_ARROKUDA] = sAnims_Arrokuda, [SPECIES_BARRASKEWDA] = sAnims_Barraskewda, [SPECIES_TOXEL] = sAnims_Toxel, - [SPECIES_TOXTRICITY] = sAnims_Toxtricity, + [SPECIES_TOXTRICITY_AMPED] = sAnims_Toxtricity, [SPECIES_SIZZLIPEDE] = sAnims_Sizzlipede, [SPECIES_CENTISKORCH] = sAnims_Centiskorch, [SPECIES_CLOBBOPUS] = sAnims_Clobbopus, [SPECIES_GRAPPLOCT] = sAnims_Grapploct, - [SPECIES_SINISTEA] = sAnims_Sinistea, - [SPECIES_POLTEAGEIST] = sAnims_Polteageist, + [SPECIES_SINISTEA_PHONY] = sAnims_Sinistea, + [SPECIES_POLTEAGEIST_PHONY] = sAnims_Polteageist, [SPECIES_HATENNA] = sAnims_Hatenna, [SPECIES_HATTREM] = sAnims_Hattrem, [SPECIES_HATTERENE] = sAnims_Hatterene, @@ -12771,15 +12762,15 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_MR_RIME] = sAnims_MrRime, [SPECIES_RUNERIGUS] = sAnims_Runerigus, [SPECIES_MILCERY] = sAnims_Milcery, - [SPECIES_ALCREMIE] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = sAnims_Alcremie, [SPECIES_FALINKS] = sAnims_Falinks, [SPECIES_PINCURCHIN] = sAnims_Pincurchin, [SPECIES_SNOM] = sAnims_Snom, [SPECIES_FROSMOTH] = sAnims_Frosmoth, [SPECIES_STONJOURNER] = sAnims_Stonjourner, - [SPECIES_EISCUE] = sAnims_Eiscue, - [SPECIES_INDEEDEE] = sAnims_Indeedee, - [SPECIES_MORPEKO] = sAnims_Morpeko, + [SPECIES_EISCUE_ICE_FACE] = sAnims_Eiscue, + [SPECIES_INDEEDEE_MALE] = sAnims_Indeedee, + [SPECIES_MORPEKO_FULL_BELLY] = sAnims_Morpeko, [SPECIES_CUFANT] = sAnims_Cufant, [SPECIES_COPPERAJAH] = sAnims_Copperajah, [SPECIES_DRACOZOLT] = sAnims_Dracozolt, @@ -12790,11 +12781,11 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_DREEPY] = sAnims_Dreepy, [SPECIES_DRAKLOAK] = sAnims_Drakloak, [SPECIES_DRAGAPULT] = sAnims_Dragapult, - [SPECIES_ZACIAN] = sAnims_Zacian, - [SPECIES_ZAMAZENTA] = sAnims_Zamazenta, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = sAnims_Zacian, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sAnims_Zamazenta, [SPECIES_ETERNATUS] = sAnims_Eternatus, [SPECIES_KUBFU] = sAnims_Kubfu, - [SPECIES_URSHIFU] = sAnims_Urshifu, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = sAnims_Urshifu, [SPECIES_ZARUDE] = sAnims_Zarude, [SPECIES_REGIELEKI] = sAnims_Regieleki, [SPECIES_REGIDRAGO] = sAnims_Regidrago, @@ -12804,10 +12795,10 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_WYRDEER] = sAnims_Wyrdeer, [SPECIES_KLEAVOR] = sAnims_Kleavor, [SPECIES_URSALUNA] = sAnims_Ursaluna, - [SPECIES_BASCULEGION] = sAnims_Basculegion, + [SPECIES_BASCULEGION_MALE] = sAnims_Basculegion, [SPECIES_SNEASLER] = sAnims_Sneasler, [SPECIES_OVERQWIL] = sAnims_Overqwil, - [SPECIES_ENAMORUS] = sAnims_Enamorus, + [SPECIES_ENAMORUS_INCARNATE] = sAnims_EnamorusIncarnate, #endif // Mega/Primal Forms [SPECIES_VENUSAUR_MEGA] = sAnims_VenusaurMega, @@ -12903,7 +12894,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_LINOONE_GALARIAN] = sAnims_LinooneGalarian, #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = sAnims_DarumakaGalarian, - [SPECIES_DARMANITAN_GALARIAN] = sAnims_DarmanitanGalarian, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = sAnims_DarmanitanGalarianStandardMode, [SPECIES_YAMASK_GALARIAN] = sAnims_YamaskGalarian, [SPECIES_STUNFISK_GALARIAN] = sAnims_StunfiskGalarian, #endif @@ -13018,7 +13009,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_BASCULIN_BLUE_STRIPED] = sAnims_Basculin, [SPECIES_BASCULIN_WHITE_STRIPED] = sAnims_Basculin, [SPECIES_DARMANITAN_ZEN_MODE] = sAnims_DarmanitanZenMode, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sAnims_DarmanitanZenModeGalarian, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = sAnims_DarmanitanGalarianZenMode, [SPECIES_DEERLING_SUMMER] = sAnims_Deerling, [SPECIES_DEERLING_AUTUMN] = sAnims_Deerling, [SPECIES_DEERLING_WINTER] = sAnims_Deerling, @@ -13090,9 +13081,9 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_GOURGEIST_LARGE] = sAnims_Gourgeist, [SPECIES_GOURGEIST_SUPER] = sAnims_Gourgeist, [SPECIES_XERNEAS_ACTIVE] = sAnims_Xerneas, - [SPECIES_ZYGARDE_10] = sAnims_Zygarde10, + [SPECIES_ZYGARDE_10_AURA_BREAK] = sAnims_Zygarde10, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = sAnims_Zygarde10, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sAnims_Zygarde, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = sAnims_Zygarde50, [SPECIES_ZYGARDE_COMPLETE] = sAnims_ZygardeComplete, [SPECIES_HOOPA_UNBOUND] = sAnims_HoopaUnbound, #endif @@ -13121,19 +13112,19 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_SILVALLY_DRAGON] = sAnims_Silvally, [SPECIES_SILVALLY_DARK] = sAnims_Silvally, [SPECIES_SILVALLY_FAIRY] = sAnims_Silvally, - [SPECIES_MINIOR_METEOR_ORANGE] = sAnims_Minior, - [SPECIES_MINIOR_METEOR_YELLOW] = sAnims_Minior, - [SPECIES_MINIOR_METEOR_GREEN] = sAnims_Minior, - [SPECIES_MINIOR_METEOR_BLUE] = sAnims_Minior, - [SPECIES_MINIOR_METEOR_INDIGO] = sAnims_Minior, - [SPECIES_MINIOR_METEOR_VIOLET] = sAnims_Minior, - [SPECIES_MINIOR_CORE_RED] = sAnims_Minior, - [SPECIES_MINIOR_CORE_ORANGE] = sAnims_Minior, - [SPECIES_MINIOR_CORE_YELLOW] = sAnims_Minior, - [SPECIES_MINIOR_CORE_GREEN] = sAnims_Minior, - [SPECIES_MINIOR_CORE_BLUE] = sAnims_Minior, - [SPECIES_MINIOR_CORE_INDIGO] = sAnims_Minior, - [SPECIES_MINIOR_CORE_VIOLET] = sAnims_Minior, + [SPECIES_MINIOR_METEOR_ORANGE] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_METEOR_YELLOW] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_METEOR_GREEN] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_METEOR_BLUE] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_METEOR_INDIGO] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_METEOR_VIOLET] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_CORE_RED] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_CORE_ORANGE] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_CORE_YELLOW] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_CORE_GREEN] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_CORE_BLUE] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_CORE_INDIGO] = sAnims_MiniorMeteor, + [SPECIES_MINIOR_CORE_VIOLET] = sAnims_MiniorMeteor, [SPECIES_MIMIKYU_BUSTED] = sAnims_MimikyuBusted, [SPECIES_NECROZMA_DUSK_MANE] = sAnims_Necrozma, [SPECIES_NECROZMA_DAWN_WINGS] = sAnims_Necrozma, @@ -13146,14 +13137,14 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_TOXTRICITY_LOW_KEY] = sAnims_Toxtricity, [SPECIES_SINISTEA_ANTIQUE] = sAnims_Sinistea, [SPECIES_POLTEAGEIST_ANTIQUE] = sAnims_Polteageist, - [SPECIES_ALCREMIE_RUBY_CREAM] = sAnims_Alcremie, - [SPECIES_ALCREMIE_MATCHA_CREAM] = sAnims_Alcremie, - [SPECIES_ALCREMIE_MINT_CREAM] = sAnims_Alcremie, - [SPECIES_ALCREMIE_LEMON_CREAM] = sAnims_Alcremie, - [SPECIES_ALCREMIE_SALTED_CREAM] = sAnims_Alcremie, - [SPECIES_ALCREMIE_RUBY_SWIRL] = sAnims_Alcremie, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = sAnims_Alcremie, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = sAnims_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = sAnims_Alcremie, [SPECIES_EISCUE_NOICE_FACE] = sAnims_Eiscue, [SPECIES_INDEEDEE_FEMALE] = sAnims_Indeedee, [SPECIES_MORPEKO_HANGRY] = sAnims_Morpeko, @@ -13204,7 +13195,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_ALCREMIE_GIGANTAMAX] = sAnims_AlcremieGigantamax, [SPECIES_COPPERAJAH_GIGANTAMAX] = sAnims_CopperajahGigantamax, [SPECIES_DURALUDON_GIGANTAMAX] = sAnims_DuraludonGigantamax, - [SPECIES_URSHIFU_GIGANTAMAX] = sAnims_UrshifuGigantamax, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sAnims_UrshifuSingleStrikeStyleGigantamax, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sAnims_UrshifuRapidStrikeStyleGigantamax, #endif [SPECIES_EGG] = sAnims_Egg, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 22fcf27c5c..e06e8f1e7b 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -364,7 +364,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ARON] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_LAIRON] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_AGGRON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CASTFORM] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 17 }, + [SPECIES_CASTFORM_NORMAL] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 17 }, [SPECIES_VOLBEAT] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8 }, [SPECIES_ILLUMISE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_LILEEP] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, @@ -389,7 +389,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_LATIAS] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_LATIOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_JIRACHI] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, - [SPECIES_DEOXYS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DEOXYS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CHIMECHO] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, #if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, @@ -417,8 +417,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_RAMPARDOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SHIELDON] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_BASTIODON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_BURMY] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 13 }, - [SPECIES_WORMADAM] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 10 }, + [SPECIES_BURMY_PLANT_CLOAK] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 13 }, + [SPECIES_WORMADAM_PLANT_CLOAK] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 10 }, [SPECIES_MOTHIM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_COMBEE] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 16 }, [SPECIES_VESPIQUEN] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, @@ -426,9 +426,9 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_BUIZEL] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_FLOATZEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_CHERUBI] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, - [SPECIES_CHERRIM] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 8 }, - [SPECIES_SHELLOS] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, - [SPECIES_GASTRODON] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, + [SPECIES_CHERRIM_OVERCAST] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 8 }, + [SPECIES_SHELLOS_WEST_SEA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, + [SPECIES_GASTRODON_WEST_SEA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, [SPECIES_AMBIPOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_DRIFLOON] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 7 }, [SPECIES_DRIFBLIM] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, @@ -492,13 +492,13 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PALKIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_HEATRAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_REGIGIGAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_GIRATINA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GIRATINA_ALTERED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CRESSELIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 8 }, [SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 10 }, [SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_SHAYMIN] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, - [SPECIES_ARCEUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SHAYMIN_LAND] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, + [SPECIES_ARCEUS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 10 }, @@ -557,12 +557,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_WHIMSICOTT] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_PETILIL] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 12 }, [SPECIES_LILLIGANT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_BASCULIN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, + [SPECIES_BASCULIN_RED_STRIPED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_SANDILE] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 18 }, [SPECIES_KROKOROK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_KROOKODILE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DARUMAKA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, - [SPECIES_DARMANITAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_DARMANITAN_STANDARD_MODE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_MARACTUS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_DWEBBLE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_CRUSTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -592,8 +592,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_VANILLITE] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_VANILLISH] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 5 }, [SPECIES_VANILLUXE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_DEERLING] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, - [SPECIES_SAWSBUCK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_DEERLING_SPRING] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, + [SPECIES_SAWSBUCK_SPRING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_EMOLGA] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 17 }, [SPECIES_KARRABLAST] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 13 }, [SPECIES_ESCAVALIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -648,14 +648,14 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_COBALION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, [SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_VIRIZION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_TORNADUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_THUNDURUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_TORNADUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_THUNDURUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_RESHIRAM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_ZEKROM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LANDORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_LANDORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_KYUREM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_KELDEO] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_MELOETTA] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 }, + [SPECIES_KELDEO_ORDINARY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, + [SPECIES_MELOETTA_ARIA] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 }, [SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, #endif #if P_GEN_6_POKEMON == TRUE @@ -675,22 +675,22 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_TALONFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_SCATTERBUG] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 13 }, [SPECIES_SPEWPA] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_VIVILLON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VIVILLON_ICY_SNOW] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LITLEO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_PYROAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLABEBE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_FLOETTE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, - [SPECIES_FLORGES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLABEBE_RED_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, + [SPECIES_FLOETTE_RED_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FLORGES_RED_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SKIDDO] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, [SPECIES_GOGOAT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_PANCHAM] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 12 }, [SPECIES_PANGORO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FURFROU] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_FURFROU_NATURAL] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_ESPURR] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 10 }, - [SPECIES_MEOWSTIC] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_MEOWSTIC_MALE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_HONEDGE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_DOUBLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_AEGISLASH] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_AEGISLASH_SHIELD] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_SPRITZEE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, [SPECIES_AROMATISSE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_SWIRLIX] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, @@ -719,17 +719,17 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_KLEFKI] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 4 }, [SPECIES_PHANTUMP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_TREVENANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_PUMPKABOO] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, - [SPECIES_GOURGEIST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_PUMPKABOO_AVERAGE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, + [SPECIES_GOURGEIST_AVERAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_BERGMITE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_AVALUGG] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_NOIBAT] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_NOIVERN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_XERNEAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_XERNEAS_NEUTRAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_YVELTAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ZYGARDE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ZYGARDE_50_AURA_BREAK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DIANCIE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 1 }, - [SPECIES_HOOPA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_HOOPA_CONFINED] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_VOLCANION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif #if P_GEN_7_POKEMON == TRUE @@ -752,12 +752,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_VIKAVOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_CRABRAWLER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ORICORIO] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_ORICORIO_BAILE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 16 }, [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_LYCANROC] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_WISHIWASHI] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, + [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, [SPECIES_MAREANIE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_TOXAPEX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MUDBRAY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, @@ -784,12 +784,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PALOSSAND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PYUKUMUKU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_TYPE_NULL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_SILVALLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MINIOR] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_SILVALLY_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, - [SPECIES_MIMIKYU] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, + [SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, @@ -862,13 +862,13 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ARROKUDA] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 13 }, [SPECIES_BARRASKEWDA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_TOXEL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_TOXTRICITY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, + [SPECIES_TOXTRICITY_AMPED] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, [SPECIES_SIZZLIPEDE] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, [SPECIES_CENTISKORCH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CLOBBOPUS] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_GRAPPLOCT] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 5 }, - [SPECIES_SINISTEA] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 17 }, - [SPECIES_POLTEAGEIST] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_SINISTEA_PHONY] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 17 }, + [SPECIES_POLTEAGEIST_PHONY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_HATENNA] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, [SPECIES_HATTREM] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_HATTERENE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, @@ -882,15 +882,15 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MR_RIME] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 4 }, [SPECIES_RUNERIGUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MILCERY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, - [SPECIES_ALCREMIE] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, [SPECIES_FALINKS] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_PINCURCHIN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_SNOM] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 20 }, [SPECIES_FROSMOTH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_STONJOURNER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_EISCUE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, - [SPECIES_INDEEDEE] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 9 }, - [SPECIES_MORPEKO] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, + [SPECIES_EISCUE_ICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, + [SPECIES_INDEEDEE_MALE] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 9 }, + [SPECIES_MORPEKO_FULL_BELLY] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_CUFANT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_COPPERAJAH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_DRACOZOLT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -901,11 +901,11 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_DREEPY] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_DRAKLOAK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_DRAGAPULT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_ZACIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ZAMAZENTA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ETERNATUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_KUBFU] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, - [SPECIES_URSHIFU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_ZARUDE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_REGIELEKI] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_REGIDRAGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -915,10 +915,10 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_WYRDEER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_BASCULEGION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BASCULEGION_MALE] = { .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 }, + [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif // Megas [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, @@ -1015,7 +1015,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_LINOONE_GALARIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, - [SPECIES_DARMANITAN_GALARIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_YAMASK_GALARIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, [SPECIES_STUNFISK_GALARIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, #endif @@ -1147,7 +1147,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 10 }, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, // Deerling [SPECIES_DEERLING_SUMMER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, [SPECIES_DEERLING_AUTUMN] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, @@ -1238,7 +1238,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = // Xerneas [SPECIES_XERNEAS_ACTIVE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, // Zygarde - [SPECIES_ZYGARDE_10] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_ZYGARDE_10_AURA_BREAK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ZYGARDE_COMPLETE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1309,14 +1309,14 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, // Alcremie - [SPECIES_ALCREMIE_RUBY_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_MINT_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_LEMON_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_SALTED_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, // Eiscue [SPECIES_EISCUE_NOICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, // Indeedee @@ -1373,7 +1373,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ALCREMIE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_COPPERAJAH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DURALUDON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif // Egg diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 988fa7db06..33e82debfe 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -360,7 +360,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ARON, gMonFrontPic_Aron), SPECIES_SPRITE(LAIRON, gMonFrontPic_Lairon), SPECIES_SPRITE(AGGRON, gMonFrontPic_Aggron), - SPECIES_SPRITE(CASTFORM, gMonFrontPic_Castform), + SPECIES_SPRITE(CASTFORM_NORMAL, gMonFrontPic_CastformNormal), SPECIES_SPRITE(VOLBEAT, gMonFrontPic_Volbeat), SPECIES_SPRITE(ILLUMISE, gMonFrontPic_Illumise), SPECIES_SPRITE(LILEEP, gMonFrontPic_Lileep), @@ -385,7 +385,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(LATIAS, gMonFrontPic_Latias), SPECIES_SPRITE(LATIOS, gMonFrontPic_Latios), SPECIES_SPRITE(JIRACHI, gMonFrontPic_Jirachi), - SPECIES_SPRITE(DEOXYS, gMonFrontPic_Deoxys), + SPECIES_SPRITE(DEOXYS_NORMAL, gMonFrontPic_DeoxysNormal), SPECIES_SPRITE(CHIMECHO, gMonFrontPic_Chimecho), #if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(TURTWIG, gMonFrontPic_Turtwig), @@ -413,8 +413,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(RAMPARDOS, gMonFrontPic_Rampardos), SPECIES_SPRITE(SHIELDON, gMonFrontPic_Shieldon), SPECIES_SPRITE(BASTIODON, gMonFrontPic_Bastiodon), - SPECIES_SPRITE(BURMY, gMonFrontPic_Burmy), - SPECIES_SPRITE(WORMADAM, gMonFrontPic_Wormadam), + SPECIES_SPRITE(BURMY_PLANT_CLOAK, gMonFrontPic_BurmyPlantCloak), + SPECIES_SPRITE(WORMADAM_PLANT_CLOAK, gMonFrontPic_WormadamPlantCloak), SPECIES_SPRITE(MOTHIM, gMonFrontPic_Mothim), SPECIES_SPRITE(COMBEE, gMonFrontPic_Combee), SPECIES_SPRITE(VESPIQUEN, gMonFrontPic_Vespiquen), @@ -422,9 +422,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(BUIZEL, gMonFrontPic_Buizel), SPECIES_SPRITE(FLOATZEL, gMonFrontPic_Floatzel), SPECIES_SPRITE(CHERUBI, gMonFrontPic_Cherubi), - SPECIES_SPRITE(CHERRIM, gMonFrontPic_Cherrim), - SPECIES_SPRITE(SHELLOS, gMonFrontPic_Shellos), - SPECIES_SPRITE(GASTRODON, gMonFrontPic_Gastrodon), + SPECIES_SPRITE(CHERRIM_OVERCAST, gMonFrontPic_CherrimOvercast), + SPECIES_SPRITE(SHELLOS_WEST_SEA, gMonFrontPic_ShellosWestSea), + SPECIES_SPRITE(GASTRODON_WEST_SEA, gMonFrontPic_GastrodonWestSea), SPECIES_SPRITE(AMBIPOM, gMonFrontPic_Ambipom), SPECIES_SPRITE(DRIFLOON, gMonFrontPic_Drifloon), SPECIES_SPRITE(DRIFBLIM, gMonFrontPic_Drifblim), @@ -488,12 +488,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PALKIA, gMonFrontPic_Palkia), SPECIES_SPRITE(HEATRAN, gMonFrontPic_Heatran), SPECIES_SPRITE(REGIGIGAS, gMonFrontPic_Regigigas), - SPECIES_SPRITE(GIRATINA, gMonFrontPic_Giratina), + SPECIES_SPRITE(GIRATINA_ALTERED, gMonFrontPic_GiratinaAltered), SPECIES_SPRITE(CRESSELIA, gMonFrontPic_Cresselia), SPECIES_SPRITE(PHIONE, gMonFrontPic_Phione), SPECIES_SPRITE(MANAPHY, gMonFrontPic_Manaphy), SPECIES_SPRITE(DARKRAI, gMonFrontPic_Darkrai), - SPECIES_SPRITE(SHAYMIN, gMonFrontPic_Shaymin), + SPECIES_SPRITE(SHAYMIN_LAND, gMonFrontPic_ShayminLand), SPECIES_SPRITE(ARCEUS, gMonFrontPic_Arceus), #endif #if P_GEN_5_POKEMON == TRUE @@ -553,12 +553,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(WHIMSICOTT, gMonFrontPic_Whimsicott), SPECIES_SPRITE(PETILIL, gMonFrontPic_Petilil), SPECIES_SPRITE(LILLIGANT, gMonFrontPic_Lilligant), - SPECIES_SPRITE(BASCULIN, gMonFrontPic_Basculin), + SPECIES_SPRITE(BASCULIN, gMonFrontPic_BasculinRedStriped), SPECIES_SPRITE(SANDILE, gMonFrontPic_Sandile), SPECIES_SPRITE(KROKOROK, gMonFrontPic_Krokorok), SPECIES_SPRITE(KROOKODILE, gMonFrontPic_Krookodile), SPECIES_SPRITE(DARUMAKA, gMonFrontPic_Darumaka), - SPECIES_SPRITE(DARMANITAN, gMonFrontPic_Darmanitan), + SPECIES_SPRITE(DARMANITAN_STANDARD_MODE, gMonFrontPic_DarmanitanStandardMode), SPECIES_SPRITE(MARACTUS, gMonFrontPic_Maractus), SPECIES_SPRITE(DWEBBLE, gMonFrontPic_Dwebble), SPECIES_SPRITE(CRUSTLE, gMonFrontPic_Crustle), @@ -588,8 +588,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(VANILLITE, gMonFrontPic_Vanillite), SPECIES_SPRITE(VANILLISH, gMonFrontPic_Vanillish), SPECIES_SPRITE(VANILLUXE, gMonFrontPic_Vanilluxe), - SPECIES_SPRITE(DEERLING, gMonFrontPic_Deerling), - SPECIES_SPRITE(SAWSBUCK, gMonFrontPic_Sawsbuck), + SPECIES_SPRITE(DEERLING_SPRING, gMonFrontPic_Deerling), + SPECIES_SPRITE(SAWSBUCK_SPRING, gMonFrontPic_SawsbuckSpring), SPECIES_SPRITE(EMOLGA, gMonFrontPic_Emolga), SPECIES_SPRITE(KARRABLAST, gMonFrontPic_Karrablast), SPECIES_SPRITE(ESCAVALIER, gMonFrontPic_Escavalier), @@ -644,14 +644,14 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(COBALION, gMonFrontPic_Cobalion), SPECIES_SPRITE(TERRAKION, gMonFrontPic_Terrakion), SPECIES_SPRITE(VIRIZION, gMonFrontPic_Virizion), - SPECIES_SPRITE(TORNADUS, gMonFrontPic_Tornadus), - SPECIES_SPRITE(THUNDURUS, gMonFrontPic_Thundurus), + SPECIES_SPRITE(TORNADUS_INCARNATE, gMonFrontPic_TornadusIncarnate), + SPECIES_SPRITE(THUNDURUS_INCARNATE, gMonFrontPic_ThundurusIncarnate), SPECIES_SPRITE(RESHIRAM, gMonFrontPic_Reshiram), SPECIES_SPRITE(ZEKROM, gMonFrontPic_Zekrom), - SPECIES_SPRITE(LANDORUS, gMonFrontPic_Landorus), + SPECIES_SPRITE(LANDORUS_INCARNATE, gMonFrontPic_LandorusIncarnate), SPECIES_SPRITE(KYUREM, gMonFrontPic_Kyurem), - SPECIES_SPRITE(KELDEO, gMonFrontPic_Keldeo), - SPECIES_SPRITE(MELOETTA, gMonFrontPic_Meloetta), + SPECIES_SPRITE(KELDEO_ORDINARY, gMonFrontPic_KeldeoOrdinary), + SPECIES_SPRITE(MELOETTA, gMonFrontPic_MeloettaAria), SPECIES_SPRITE(GENESECT, gMonFrontPic_Genesect), #endif #if P_GEN_6_POKEMON == TRUE @@ -671,22 +671,22 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(TALONFLAME, gMonFrontPic_Talonflame), SPECIES_SPRITE(SCATTERBUG, gMonFrontPic_Scatterbug), SPECIES_SPRITE(SPEWPA, gMonFrontPic_Spewpa), - SPECIES_SPRITE(VIVILLON, gMonFrontPic_Vivillon), + SPECIES_SPRITE(VIVILLON_ICY_SNOW, gMonFrontPic_VivillonIcySnow), SPECIES_SPRITE(LITLEO, gMonFrontPic_Litleo), SPECIES_SPRITE(PYROAR, gMonFrontPic_Pyroar), - SPECIES_SPRITE(FLABEBE, gMonFrontPic_Flabebe), - SPECIES_SPRITE(FLOETTE, gMonFrontPic_Floette), - SPECIES_SPRITE(FLORGES, gMonFrontPic_Florges), + SPECIES_SPRITE(FLABEBE_RED_FLOWER, gMonFrontPic_Flabebe), + SPECIES_SPRITE(FLOETTE_RED_FLOWER, gMonFrontPic_Floette), + SPECIES_SPRITE(FLORGES_RED_FLOWER, gMonFrontPic_Florges), SPECIES_SPRITE(SKIDDO, gMonFrontPic_Skiddo), SPECIES_SPRITE(GOGOAT, gMonFrontPic_Gogoat), SPECIES_SPRITE(PANCHAM, gMonFrontPic_Pancham), SPECIES_SPRITE(PANGORO, gMonFrontPic_Pangoro), - SPECIES_SPRITE(FURFROU, gMonFrontPic_Furfrou), + SPECIES_SPRITE(FURFROU_NATURAL, gMonFrontPic_FurfrouNatural), SPECIES_SPRITE(ESPURR, gMonFrontPic_Espurr), - SPECIES_SPRITE(MEOWSTIC, gMonFrontPic_Meowstic), + SPECIES_SPRITE(MEOWSTIC_MALE, gMonFrontPic_MeowsticMale), SPECIES_SPRITE(HONEDGE, gMonFrontPic_Honedge), SPECIES_SPRITE(DOUBLADE, gMonFrontPic_Doublade), - SPECIES_SPRITE(AEGISLASH, gMonFrontPic_Aegislash), + SPECIES_SPRITE(AEGISLASH_SHIELD, gMonFrontPic_AegislashShield), SPECIES_SPRITE(SPRITZEE, gMonFrontPic_Spritzee), SPECIES_SPRITE(AROMATISSE, gMonFrontPic_Aromatisse), SPECIES_SPRITE(SWIRLIX, gMonFrontPic_Swirlix), @@ -715,17 +715,17 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(KLEFKI, gMonFrontPic_Klefki), SPECIES_SPRITE(PHANTUMP, gMonFrontPic_Phantump), SPECIES_SPRITE(TREVENANT, gMonFrontPic_Trevenant), - SPECIES_SPRITE(PUMPKABOO, gMonFrontPic_Pumpkaboo), - SPECIES_SPRITE(GOURGEIST, gMonFrontPic_Gourgeist), + SPECIES_SPRITE(PUMPKABOO_AVERAGE, gMonFrontPic_PumpkabooAverage), + SPECIES_SPRITE(GOURGEIST_AVERAGE, gMonFrontPic_GourgeistAverage), SPECIES_SPRITE(BERGMITE, gMonFrontPic_Bergmite), SPECIES_SPRITE(AVALUGG, gMonFrontPic_Avalugg), SPECIES_SPRITE(NOIBAT, gMonFrontPic_Noibat), SPECIES_SPRITE(NOIVERN, gMonFrontPic_Noivern), - SPECIES_SPRITE(XERNEAS, gMonFrontPic_Xerneas), + SPECIES_SPRITE(XERNEAS_NEUTRAL, gMonFrontPic_XerneasNeutral), SPECIES_SPRITE(YVELTAL, gMonFrontPic_Yveltal), - SPECIES_SPRITE(ZYGARDE, gMonFrontPic_Zygarde), + SPECIES_SPRITE(ZYGARDE_50_AURA_BREAK, gMonFrontPic_Zygarde50), SPECIES_SPRITE(DIANCIE, gMonFrontPic_Diancie), - SPECIES_SPRITE(HOOPA, gMonFrontPic_Hoopa), + SPECIES_SPRITE(HOOPA_CONFINED, gMonFrontPic_HoopaConfined), SPECIES_SPRITE(VOLCANION, gMonFrontPic_Volcanion), #endif #if P_GEN_7_POKEMON == TRUE @@ -748,12 +748,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(VIKAVOLT, gMonFrontPic_Vikavolt), SPECIES_SPRITE(CRABRAWLER, gMonFrontPic_Crabrawler), SPECIES_SPRITE(CRABOMINABLE, gMonFrontPic_Crabominable), - SPECIES_SPRITE(ORICORIO, gMonFrontPic_Oricorio), + SPECIES_SPRITE(ORICORIO_BAILE, gMonFrontPic_OricorioBaile), SPECIES_SPRITE(CUTIEFLY, gMonFrontPic_Cutiefly), SPECIES_SPRITE(RIBOMBEE, gMonFrontPic_Ribombee), SPECIES_SPRITE(ROCKRUFF, gMonFrontPic_Rockruff), - SPECIES_SPRITE(LYCANROC, gMonFrontPic_Lycanroc), - SPECIES_SPRITE(WISHIWASHI, gMonFrontPic_Wishiwashi), + SPECIES_SPRITE(LYCANROC_MIDDAY, gMonFrontPic_LycanrocMidday), + SPECIES_SPRITE(WISHIWASHI_SOLO, gMonFrontPic_WishiwashiSolo), SPECIES_SPRITE(MAREANIE, gMonFrontPic_Mareanie), SPECIES_SPRITE(TOXAPEX, gMonFrontPic_Toxapex), SPECIES_SPRITE(MUDBRAY, gMonFrontPic_Mudbray), @@ -781,11 +781,11 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PYUKUMUKU, gMonFrontPic_Pyukumuku), SPECIES_SPRITE(TYPE_NULL, gMonFrontPic_TypeNull), SPECIES_SPRITE(SILVALLY, gMonFrontPic_Silvally), - SPECIES_SPRITE(MINIOR, gMonFrontPic_Minior), + SPECIES_SPRITE(MINIOR_METEOR_RED, gMonFrontPic_MiniorMeteor), SPECIES_SPRITE(KOMALA, gMonFrontPic_Komala), SPECIES_SPRITE(TURTONATOR, gMonFrontPic_Turtonator), SPECIES_SPRITE(TOGEDEMARU, gMonFrontPic_Togedemaru), - SPECIES_SPRITE(MIMIKYU, gMonFrontPic_Mimikyu), + SPECIES_SPRITE(MIMIKYU_DISGUISED, gMonFrontPic_MimikyuDisguised), SPECIES_SPRITE(BRUXISH, gMonFrontPic_Bruxish), SPECIES_SPRITE(DRAMPA, gMonFrontPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonFrontPic_Dhelmise), @@ -858,13 +858,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ARROKUDA, gMonFrontPic_Arrokuda), SPECIES_SPRITE(BARRASKEWDA, gMonFrontPic_Barraskewda), SPECIES_SPRITE(TOXEL, gMonFrontPic_Toxel), - SPECIES_SPRITE(TOXTRICITY, gMonFrontPic_Toxtricity), + SPECIES_SPRITE(TOXTRICITY_AMPED, gMonFrontPic_ToxtricityAmped), SPECIES_SPRITE(SIZZLIPEDE, gMonFrontPic_Sizzlipede), SPECIES_SPRITE(CENTISKORCH, gMonFrontPic_Centiskorch), SPECIES_SPRITE(CLOBBOPUS, gMonFrontPic_Clobbopus), SPECIES_SPRITE(GRAPPLOCT, gMonFrontPic_Grapploct), - SPECIES_SPRITE(SINISTEA, gMonFrontPic_Sinistea), - SPECIES_SPRITE(POLTEAGEIST, gMonFrontPic_Polteageist), + SPECIES_SPRITE(SINISTEA_PHONY, gMonFrontPic_Sinistea), + SPECIES_SPRITE(POLTEAGEIST_PHONY, gMonFrontPic_Polteageist), SPECIES_SPRITE(HATENNA, gMonFrontPic_Hatenna), SPECIES_SPRITE(HATTREM, gMonFrontPic_Hattrem), SPECIES_SPRITE(HATTERENE, gMonFrontPic_Hatterene), @@ -884,9 +884,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(SNOM, gMonFrontPic_Snom), SPECIES_SPRITE(FROSMOTH, gMonFrontPic_Frosmoth), SPECIES_SPRITE(STONJOURNER, gMonFrontPic_Stonjourner), - SPECIES_SPRITE(EISCUE, gMonFrontPic_Eiscue), - SPECIES_SPRITE(INDEEDEE, gMonFrontPic_Indeedee), - SPECIES_SPRITE(MORPEKO, gMonFrontPic_Morpeko), + SPECIES_SPRITE(EISCUE_ICE_FACE, gMonFrontPic_EiscueFace), + SPECIES_SPRITE(INDEEDEE_MALE, gMonFrontPic_IndeedeeMale), + SPECIES_SPRITE(MORPEKO_FULL_BELLY, gMonFrontPic_MorpekoFullBelly), SPECIES_SPRITE(CUFANT, gMonFrontPic_Cufant), SPECIES_SPRITE(COPPERAJAH, gMonFrontPic_Copperajah), SPECIES_SPRITE(DRACOZOLT, gMonFrontPic_Dracozolt), @@ -897,11 +897,11 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(DREEPY, gMonFrontPic_Dreepy), SPECIES_SPRITE(DRAKLOAK, gMonFrontPic_Drakloak), SPECIES_SPRITE(DRAGAPULT, gMonFrontPic_Dragapult), - SPECIES_SPRITE(ZACIAN, gMonFrontPic_Zacian), - SPECIES_SPRITE(ZAMAZENTA, gMonFrontPic_Zamazenta), + SPECIES_SPRITE(ZACIAN_HERO_OF_MANY_BATTLES, gMonFrontPic_ZacianHeroOfManyBattles), + SPECIES_SPRITE(ZAMAZENTA_HERO_OF_MANY_BATTLES, gMonFrontPic_ZamazentaHeroOfManyBattles), SPECIES_SPRITE(ETERNATUS, gMonFrontPic_Eternatus), SPECIES_SPRITE(KUBFU, gMonFrontPic_Kubfu), - SPECIES_SPRITE(URSHIFU, gMonFrontPic_Urshifu), + SPECIES_SPRITE(URSHIFU_SINGLE_STRIKE_STYLE, gMonFrontPic_UrshifuSingleStrikeStyle), SPECIES_SPRITE(ZARUDE, gMonFrontPic_Zarude), SPECIES_SPRITE(REGIELEKI, gMonFrontPic_Regieleki), SPECIES_SPRITE(REGIDRAGO, gMonFrontPic_Regidrago), @@ -911,10 +911,10 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(WYRDEER, gMonFrontPic_Wyrdeer), SPECIES_SPRITE(KLEAVOR, gMonFrontPic_Kleavor), SPECIES_SPRITE(URSALUNA, gMonFrontPic_Ursaluna), - SPECIES_SPRITE(BASCULEGION, gMonFrontPic_Basculegion), + SPECIES_SPRITE(BASCULEGION_MALE, gMonFrontPic_BasculegionMale), SPECIES_SPRITE(SNEASLER, gMonFrontPic_Sneasler), SPECIES_SPRITE(OVERQWIL, gMonFrontPic_Overqwil), - SPECIES_SPRITE(ENAMORUS, gMonFrontPic_Enamorus), + SPECIES_SPRITE(ENAMORUS_INCARNATE, gMonFrontPic_EnamorusIncarnate), #endif SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_VenusaurMega), SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_CharizardMegaX), @@ -1010,7 +1010,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(LINOONE_GALARIAN, gMonFrontPic_LinooneGalarian), #if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonFrontPic_DarumakaGalarian), - SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonFrontPic_DarmanitanGalarian), + SPECIES_SPRITE(DARMANITAN_GALARIAN_STANDARD_MODE, gMonFrontPic_DarmanitanGalarianStandardMode), SPECIES_SPRITE(YAMASK_GALARIAN, gMonFrontPic_YamaskGalarian), SPECIES_SPRITE(STUNFISK_GALARIAN, gMonFrontPic_StunfiskGalarian), #endif @@ -1140,7 +1140,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonFrontPic_BasculinWhiteStriped), SPECIES_SPRITE(DARMANITAN_ZEN_MODE, gMonFrontPic_DarmanitanZenMode), - SPECIES_SPRITE(DARMANITAN_ZEN_MODE_GALARIAN, gMonFrontPic_DarmanitanZenModeGalarian), + SPECIES_SPRITE(DARMANITAN_GALARIAN_ZEN_MODE, gMonFrontPic_DarmanitanGalarianZenMode), SPECIES_SPRITE(DEERLING_SUMMER, gMonFrontPic_Deerling), SPECIES_SPRITE(DEERLING_AUTUMN, gMonFrontPic_Deerling), @@ -1233,7 +1233,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ZYGARDE_10, gMonFrontPic_Zygarde10), SPECIES_SPRITE(ZYGARDE_10_POWER_CONSTRUCT, gMonFrontPic_Zygarde10), - SPECIES_SPRITE(ZYGARDE_50_POWER_CONSTRUCT, gMonFrontPic_Zygarde), + SPECIES_SPRITE(ZYGARDE_50_POWER_CONSTRUCT, gMonFrontPic_Zygarde50), SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonFrontPic_ZygardeComplete), SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound), @@ -1269,12 +1269,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(SILVALLY_DARK, gMonFrontPic_Silvally), SPECIES_SPRITE(SILVALLY_FAIRY, gMonFrontPic_Silvally), - SPECIES_SPRITE(MINIOR_METEOR_ORANGE, gMonFrontPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_YELLOW, gMonFrontPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_GREEN, gMonFrontPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_BLUE, gMonFrontPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_INDIGO, gMonFrontPic_Minior), - SPECIES_SPRITE(MINIOR_METEOR_VIOLET, gMonFrontPic_Minior), + SPECIES_SPRITE(MINIOR_METEOR_ORANGE, gMonFrontPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_YELLOW, gMonFrontPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_GREEN, gMonFrontPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_BLUE, gMonFrontPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_INDIGO, gMonFrontPic_MiniorMeteor), + SPECIES_SPRITE(MINIOR_METEOR_VIOLET, gMonFrontPic_MiniorMeteor), SPECIES_SPRITE(MINIOR_CORE_RED, gMonFrontPic_MiniorCore), SPECIES_SPRITE(MINIOR_CORE_ORANGE, gMonFrontPic_MiniorCore), SPECIES_SPRITE(MINIOR_CORE_YELLOW, gMonFrontPic_MiniorCore), @@ -1367,7 +1367,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(ALCREMIE_GIGANTAMAX, gMonFrontPic_AlcremieGigantamax), SPECIES_SPRITE(COPPERAJAH_GIGANTAMAX, gMonFrontPic_CopperajahGigantamax), SPECIES_SPRITE(DURALUDON_GIGANTAMAX, gMonFrontPic_DuraludonGigantamax), - SPECIES_SPRITE(URSHIFU_GIGANTAMAX, gMonFrontPic_UrshifuGigantamax), + SPECIES_SPRITE(URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX, gMonFrontPic_UrshifuSingleStrikeGigantamax), SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, gMonFrontPic_UrshifuRapidStrikeGigantamax), #endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 33bc94fecc..8e4a9c32b2 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -360,7 +360,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(ARON, gMonPalette_Aron), SPECIES_PAL(LAIRON, gMonPalette_Lairon), SPECIES_PAL(AGGRON, gMonPalette_Aggron), - SPECIES_PAL(CASTFORM, gMonPalette_Castform), + SPECIES_PAL(CASTFORM_NORMAL, gMonPalette_CastformNormal), SPECIES_PAL(VOLBEAT, gMonPalette_Volbeat), SPECIES_PAL(ILLUMISE, gMonPalette_Illumise), SPECIES_PAL(LILEEP, gMonPalette_Lileep), @@ -385,7 +385,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(LATIAS, gMonPalette_Latias), SPECIES_PAL(LATIOS, gMonPalette_Latios), SPECIES_PAL(JIRACHI, gMonPalette_Jirachi), - SPECIES_PAL(DEOXYS, gMonPalette_Deoxys), + SPECIES_PAL(DEOXYS_NORMAL, gMonPalette_DeoxysNormal), SPECIES_PAL(CHIMECHO, gMonPalette_Chimecho), #if P_GEN_4_POKEMON == TRUE SPECIES_PAL(TURTWIG, gMonPalette_Turtwig), @@ -413,8 +413,8 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(RAMPARDOS, gMonPalette_Rampardos), SPECIES_PAL(SHIELDON, gMonPalette_Shieldon), SPECIES_PAL(BASTIODON, gMonPalette_Bastiodon), - SPECIES_PAL(BURMY, gMonPalette_Burmy), - SPECIES_PAL(WORMADAM, gMonPalette_Wormadam), + SPECIES_PAL(BURMY_PLANT_CLOAK, gMonPalette_BurmyPlantCloak), + SPECIES_PAL(WORMADAM_PLANT_CLOAK, gMonPalette_WormadamPlantCloak), SPECIES_PAL(MOTHIM, gMonPalette_Mothim), SPECIES_PAL(COMBEE, gMonPalette_Combee), SPECIES_PAL(VESPIQUEN, gMonPalette_Vespiquen), @@ -422,9 +422,9 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(BUIZEL, gMonPalette_Buizel), SPECIES_PAL(FLOATZEL, gMonPalette_Floatzel), SPECIES_PAL(CHERUBI, gMonPalette_Cherubi), - SPECIES_PAL(CHERRIM, gMonPalette_Cherrim), - SPECIES_PAL(SHELLOS, gMonPalette_Shellos), - SPECIES_PAL(GASTRODON, gMonPalette_Gastrodon), + SPECIES_PAL(CHERRIM_OVERCAST, gMonPalette_CherrimOvercast), + SPECIES_PAL(SHELLOS_WEST_SEA, gMonPalette_ShellosWestSea), + SPECIES_PAL(GASTRODON_WEST_SEA, gMonPalette_GastrodonWestSea), SPECIES_PAL(AMBIPOM, gMonPalette_Ambipom), SPECIES_PAL(DRIFLOON, gMonPalette_Drifloon), SPECIES_PAL(DRIFBLIM, gMonPalette_Drifblim), @@ -488,12 +488,12 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(PALKIA, gMonPalette_Palkia), SPECIES_PAL(HEATRAN, gMonPalette_Heatran), SPECIES_PAL(REGIGIGAS, gMonPalette_Regigigas), - SPECIES_PAL(GIRATINA, gMonPalette_Giratina), + SPECIES_PAL(GIRATINA_ALTERED, gMonPalette_GiratinaAltered), SPECIES_PAL(CRESSELIA, gMonPalette_Cresselia), SPECIES_PAL(PHIONE, gMonPalette_Phione), SPECIES_PAL(MANAPHY, gMonPalette_Manaphy), SPECIES_PAL(DARKRAI, gMonPalette_Darkrai), - SPECIES_PAL(SHAYMIN, gMonPalette_Shaymin), + SPECIES_PAL(SHAYMIN_LAND, gMonPalette_ShayminLand), SPECIES_PAL(ARCEUS, gMonPalette_Arceus), #endif #if P_GEN_5_POKEMON == TRUE @@ -553,12 +553,12 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(WHIMSICOTT, gMonPalette_Whimsicott), SPECIES_PAL(PETILIL, gMonPalette_Petilil), SPECIES_PAL(LILLIGANT, gMonPalette_Lilligant), - SPECIES_PAL(BASCULIN, gMonPalette_Basculin), + SPECIES_PAL(BASCULIN, gMonPalette_BasculinRedStriped), SPECIES_PAL(SANDILE, gMonPalette_Sandile), SPECIES_PAL(KROKOROK, gMonPalette_Krokorok), SPECIES_PAL(KROOKODILE, gMonPalette_Krookodile), SPECIES_PAL(DARUMAKA, gMonPalette_Darumaka), - SPECIES_PAL(DARMANITAN, gMonPalette_Darmanitan), + SPECIES_PAL(DARMANITAN_STANDARD_MODE, gMonPalette_DarmanitanStandardMode), SPECIES_PAL(MARACTUS, gMonPalette_Maractus), SPECIES_PAL(DWEBBLE, gMonPalette_Dwebble), SPECIES_PAL(CRUSTLE, gMonPalette_Crustle), @@ -588,8 +588,8 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(VANILLITE, gMonPalette_Vanillite), SPECIES_PAL(VANILLISH, gMonPalette_Vanillish), SPECIES_PAL(VANILLUXE, gMonPalette_Vanilluxe), - SPECIES_PAL(DEERLING, gMonPalette_Deerling), - SPECIES_PAL(SAWSBUCK, gMonPalette_Sawsbuck), + SPECIES_PAL(DEERLING_SPRING, gMonPalette_DeerlingSpring), + SPECIES_PAL(SAWSBUCK_SPRING, gMonPalette_SawsbuckSpring), SPECIES_PAL(EMOLGA, gMonPalette_Emolga), SPECIES_PAL(KARRABLAST, gMonPalette_Karrablast), SPECIES_PAL(ESCAVALIER, gMonPalette_Escavalier), @@ -644,14 +644,14 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(COBALION, gMonPalette_Cobalion), SPECIES_PAL(TERRAKION, gMonPalette_Terrakion), SPECIES_PAL(VIRIZION, gMonPalette_Virizion), - SPECIES_PAL(TORNADUS, gMonPalette_Tornadus), - SPECIES_PAL(THUNDURUS, gMonPalette_Thundurus), + SPECIES_PAL(TORNADUS_INCARNATE, gMonPalette_TornadusIncarnate), + SPECIES_PAL(THUNDURUS_INCARNATE, gMonPalette_ThundurusIncarnate), SPECIES_PAL(RESHIRAM, gMonPalette_Reshiram), SPECIES_PAL(ZEKROM, gMonPalette_Zekrom), - SPECIES_PAL(LANDORUS, gMonPalette_Landorus), + SPECIES_PAL(LANDORUS_INCARNATE, gMonPalette_LandorusIncarnate), SPECIES_PAL(KYUREM, gMonPalette_Kyurem), - SPECIES_PAL(KELDEO, gMonPalette_Keldeo), - SPECIES_PAL(MELOETTA, gMonPalette_Meloetta), + SPECIES_PAL(KELDEO_ORDINARY, gMonPalette_KeldeoOrdinary), + SPECIES_PAL(MELOETTA, gMonPalette_MeloettaAria), SPECIES_PAL(GENESECT, gMonPalette_Genesect), #endif #if P_GEN_6_POKEMON == TRUE @@ -671,22 +671,22 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(TALONFLAME, gMonPalette_Talonflame), SPECIES_PAL(SCATTERBUG, gMonPalette_Scatterbug), SPECIES_PAL(SPEWPA, gMonPalette_Spewpa), - SPECIES_PAL(VIVILLON, gMonPalette_Vivillon), + SPECIES_PAL(VIVILLON_ICY_SNOW, gMonPalette_VivillonIcySnow), SPECIES_PAL(LITLEO, gMonPalette_Litleo), SPECIES_PAL(PYROAR, gMonPalette_Pyroar), - SPECIES_PAL(FLABEBE, gMonPalette_Flabebe), - SPECIES_PAL(FLOETTE, gMonPalette_Floette), - SPECIES_PAL(FLORGES, gMonPalette_Florges), + SPECIES_PAL(FLABEBE_RED_FLOWER, gMonPalette_FlabebeRedFlower), + SPECIES_PAL(FLOETTE_RED_FLOWER, gMonPalette_FloetteRedFlower), + SPECIES_PAL(FLORGES_RED_FLOWER, gMonPalette_FlorgesRedFlower), SPECIES_PAL(SKIDDO, gMonPalette_Skiddo), SPECIES_PAL(GOGOAT, gMonPalette_Gogoat), SPECIES_PAL(PANCHAM, gMonPalette_Pancham), SPECIES_PAL(PANGORO, gMonPalette_Pangoro), - SPECIES_PAL(FURFROU, gMonPalette_Furfrou), + SPECIES_PAL(FURFROU_NATURAL, gMonPalette_FurfrouNatural), SPECIES_PAL(ESPURR, gMonPalette_Espurr), - SPECIES_PAL(MEOWSTIC, gMonPalette_Meowstic), + SPECIES_PAL(MEOWSTIC_MALE, gMonPalette_MeowsticMale), SPECIES_PAL(HONEDGE, gMonPalette_Honedge), SPECIES_PAL(DOUBLADE, gMonPalette_Doublade), - SPECIES_PAL(AEGISLASH, gMonPalette_Aegislash), + SPECIES_PAL(AEGISLASH_SHIELD, gMonPalette_AegislashShield), SPECIES_PAL(SPRITZEE, gMonPalette_Spritzee), SPECIES_PAL(AROMATISSE, gMonPalette_Aromatisse), SPECIES_PAL(SWIRLIX, gMonPalette_Swirlix), @@ -715,17 +715,17 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(KLEFKI, gMonPalette_Klefki), SPECIES_PAL(PHANTUMP, gMonPalette_Phantump), SPECIES_PAL(TREVENANT, gMonPalette_Trevenant), - SPECIES_PAL(PUMPKABOO, gMonPalette_Pumpkaboo), - SPECIES_PAL(GOURGEIST, gMonPalette_Gourgeist), + SPECIES_PAL(PUMPKABOO_AVERAGE, gMonPalette_Pumpkaboo), + SPECIES_PAL(GOURGEIST_AVERAGE, gMonPalette_Gourgeist), SPECIES_PAL(BERGMITE, gMonPalette_Bergmite), SPECIES_PAL(AVALUGG, gMonPalette_Avalugg), SPECIES_PAL(NOIBAT, gMonPalette_Noibat), SPECIES_PAL(NOIVERN, gMonPalette_Noivern), - SPECIES_PAL(XERNEAS, gMonPalette_Xerneas), + SPECIES_PAL(XERNEAS_NEUTRAL, gMonPalette_XerneasNeutral), SPECIES_PAL(YVELTAL, gMonPalette_Yveltal), - SPECIES_PAL(ZYGARDE, gMonPalette_Zygarde), + SPECIES_PAL(ZYGARDE_50_AURA_BREAK, gMonPalette_Zygarde50), SPECIES_PAL(DIANCIE, gMonPalette_Diancie), - SPECIES_PAL(HOOPA, gMonPalette_Hoopa), + SPECIES_PAL(HOOPA_CONFINED, gMonPalette_HoopaConfined), SPECIES_PAL(VOLCANION, gMonPalette_Volcanion), #endif #if P_GEN_7_POKEMON == TRUE @@ -748,12 +748,12 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(VIKAVOLT, gMonPalette_Vikavolt), SPECIES_PAL(CRABRAWLER, gMonPalette_Crabrawler), SPECIES_PAL(CRABOMINABLE, gMonPalette_Crabominable), - SPECIES_PAL(ORICORIO, gMonPalette_Oricorio), + SPECIES_PAL(ORICORIO_BAILE, gMonPalette_OricorioBaile), SPECIES_PAL(CUTIEFLY, gMonPalette_Cutiefly), SPECIES_PAL(RIBOMBEE, gMonPalette_Ribombee), SPECIES_PAL(ROCKRUFF, gMonPalette_Rockruff), - SPECIES_PAL(LYCANROC, gMonPalette_Lycanroc), - SPECIES_PAL(WISHIWASHI, gMonPalette_Wishiwashi), + SPECIES_PAL(LYCANROC_MIDDAY, gMonPalette_LycanrocMidday), + SPECIES_PAL(WISHIWASHI_SOLO, gMonPalette_WishiwashiSolo), SPECIES_PAL(MAREANIE, gMonPalette_Mareanie), SPECIES_PAL(TOXAPEX, gMonPalette_Toxapex), SPECIES_PAL(MUDBRAY, gMonPalette_Mudbray), @@ -780,12 +780,12 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(PALOSSAND, gMonPalette_Palossand), SPECIES_PAL(PYUKUMUKU, gMonPalette_Pyukumuku), SPECIES_PAL(TYPE_NULL, gMonPalette_TypeNull), - SPECIES_PAL(SILVALLY, gMonPalette_Silvally), - SPECIES_PAL(MINIOR, gMonPalette_Minior), + SPECIES_PAL(SILVALLY_NORMAL, gMonPalette_SilvallyNormal), + SPECIES_PAL(MINIOR_METEOR_RED, gMonPalette_MiniorMeteor), SPECIES_PAL(KOMALA, gMonPalette_Komala), SPECIES_PAL(TURTONATOR, gMonPalette_Turtonator), SPECIES_PAL(TOGEDEMARU, gMonPalette_Togedemaru), - SPECIES_PAL(MIMIKYU, gMonPalette_Mimikyu), + SPECIES_PAL(MIMIKYU_DISGUISED, gMonPalette_MimikyuDisguised), SPECIES_PAL(BRUXISH, gMonPalette_Bruxish), SPECIES_PAL(DRAMPA, gMonPalette_Drampa), SPECIES_PAL(DHELMISE, gMonPalette_Dhelmise), @@ -858,13 +858,13 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(ARROKUDA, gMonPalette_Arrokuda), SPECIES_PAL(BARRASKEWDA, gMonPalette_Barraskewda), SPECIES_PAL(TOXEL, gMonPalette_Toxel), - SPECIES_PAL(TOXTRICITY, gMonPalette_Toxtricity), + SPECIES_PAL(TOXTRICITY_AMPED, gMonPalette_ToxtricityAmped), SPECIES_PAL(SIZZLIPEDE, gMonPalette_Sizzlipede), SPECIES_PAL(CENTISKORCH, gMonPalette_Centiskorch), SPECIES_PAL(CLOBBOPUS, gMonPalette_Clobbopus), SPECIES_PAL(GRAPPLOCT, gMonPalette_Grapploct), - SPECIES_PAL(SINISTEA, gMonPalette_Sinistea), - SPECIES_PAL(POLTEAGEIST, gMonPalette_Polteageist), + SPECIES_PAL(SINISTEA_PHONY, gMonPalette_Sinistea), + SPECIES_PAL(POLTEAGEIST_PHONY, gMonPalette_Polteageist), SPECIES_PAL(HATENNA, gMonPalette_Hatenna), SPECIES_PAL(HATTREM, gMonPalette_Hattrem), SPECIES_PAL(HATTERENE, gMonPalette_Hatterene), @@ -884,9 +884,9 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(SNOM, gMonPalette_Snom), SPECIES_PAL(FROSMOTH, gMonPalette_Frosmoth), SPECIES_PAL(STONJOURNER, gMonPalette_Stonjourner), - SPECIES_PAL(EISCUE, gMonPalette_Eiscue), - SPECIES_PAL(INDEEDEE, gMonPalette_Indeedee), - SPECIES_PAL(MORPEKO, gMonPalette_Morpeko), + SPECIES_PAL(EISCUE_ICE_FACE, gMonPalette_EiscueIceFace), + SPECIES_PAL(INDEEDEE_MALE, gMonPalette_IndeedeeMale), + SPECIES_PAL(MORPEKO_FULL_BELLY, gMonPalette_MorpekoFullBelly), SPECIES_PAL(CUFANT, gMonPalette_Cufant), SPECIES_PAL(COPPERAJAH, gMonPalette_Copperajah), SPECIES_PAL(DRACOZOLT, gMonPalette_Dracozolt), @@ -897,11 +897,11 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(DREEPY, gMonPalette_Dreepy), SPECIES_PAL(DRAKLOAK, gMonPalette_Drakloak), SPECIES_PAL(DRAGAPULT, gMonPalette_Dragapult), - SPECIES_PAL(ZACIAN, gMonPalette_Zacian), - SPECIES_PAL(ZAMAZENTA, gMonPalette_Zamazenta), + SPECIES_PAL(ZACIAN_HERO_OF_MANY_BATTLES, gMonPalette_ZacianHeroOfManyBattles), + SPECIES_PAL(ZAMAZENTA_HERO_OF_MANY_BATTLES, gMonPalette_ZamazentaHeroOfManyBattles), SPECIES_PAL(ETERNATUS, gMonPalette_Eternatus), SPECIES_PAL(KUBFU, gMonPalette_Kubfu), - SPECIES_PAL(URSHIFU, gMonPalette_Urshifu), + SPECIES_PAL(URSHIFU_SINGLE_STRIKE_STYLE, gMonPalette_UrshifuSingleStrikeStyle), SPECIES_PAL(ZARUDE, gMonPalette_Zarude), SPECIES_PAL(REGIELEKI, gMonPalette_Regieleki), SPECIES_PAL(REGIDRAGO, gMonPalette_Regidrago), @@ -911,10 +911,10 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(WYRDEER, gMonPalette_Wyrdeer), SPECIES_PAL(KLEAVOR, gMonPalette_Kleavor), SPECIES_PAL(URSALUNA, gMonPalette_Ursaluna), - SPECIES_PAL(BASCULEGION, gMonPalette_Basculegion), + SPECIES_PAL(BASCULEGION_MALE, gMonPalette_BasculegionMale), SPECIES_PAL(SNEASLER, gMonPalette_Sneasler), SPECIES_PAL(OVERQWIL, gMonPalette_Overqwil), - SPECIES_PAL(ENAMORUS, gMonPalette_Enamorus), + SPECIES_PAL(ENAMORUS_INCARNATE, gMonPalette_EnamorusIncarnate), #endif SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_VenusaurMega), SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_CharizardMegaX), @@ -1010,7 +1010,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(LINOONE_GALARIAN, gMonPalette_LinooneGalarian), #if P_GEN_5_POKEMON == TRUE SPECIES_PAL(DARUMAKA_GALARIAN, gMonPalette_DarumakaGalarian), - SPECIES_PAL(DARMANITAN_GALARIAN, gMonPalette_DarmanitanGalarian), + SPECIES_PAL(DARMANITAN_GALARIAN_STANDARD_MODE, gMonPalette_DarmanitanGalarianStandardMode), SPECIES_PAL(YAMASK_GALARIAN, gMonPalette_YamaskGalarian), SPECIES_PAL(STUNFISK_GALARIAN, gMonPalette_StunfiskGalarian), #endif @@ -1141,7 +1141,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(BASCULIN_WHITE_STRIPED, gMonPalette_BasculinWhiteStriped), SPECIES_PAL(DARMANITAN_ZEN_MODE, gMonPalette_DarmanitanZenMode), - SPECIES_PAL(DARMANITAN_ZEN_MODE_GALARIAN, gMonPalette_DarmanitanZenModeGalarian), + SPECIES_PAL(DARMANITAN_GALARIAN_ZEN_MODE, gMonPalette_DarmanitanGalarianZenMode), SPECIES_PAL(DEERLING_SUMMER, gMonPalette_DeerlingSummer), SPECIES_PAL(DEERLING_AUTUMN, gMonPalette_DeerlingAutumn), @@ -1234,7 +1234,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(ZYGARDE_10, gMonPalette_Zygarde10), SPECIES_PAL(ZYGARDE_10_POWER_CONSTRUCT, gMonPalette_Zygarde10), - SPECIES_PAL(ZYGARDE_50_POWER_CONSTRUCT, gMonPalette_Zygarde), + SPECIES_PAL(ZYGARDE_50_POWER_CONSTRUCT, gMonPalette_Zygarde50), SPECIES_PAL(ZYGARDE_COMPLETE, gMonPalette_ZygardeComplete), SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound), @@ -1270,12 +1270,12 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(SILVALLY_DARK, gMonPalette_SilvallyDark), SPECIES_PAL(SILVALLY_FAIRY, gMonPalette_SilvallyFairy), - SPECIES_PAL(MINIOR_METEOR_ORANGE, gMonPalette_Minior), - SPECIES_PAL(MINIOR_METEOR_YELLOW, gMonPalette_Minior), - SPECIES_PAL(MINIOR_METEOR_GREEN, gMonPalette_Minior), - SPECIES_PAL(MINIOR_METEOR_BLUE, gMonPalette_Minior), - SPECIES_PAL(MINIOR_METEOR_INDIGO, gMonPalette_Minior), - SPECIES_PAL(MINIOR_METEOR_VIOLET, gMonPalette_Minior), + SPECIES_PAL(MINIOR_METEOR_ORANGE, gMonPalette_MiniorMeteor), + SPECIES_PAL(MINIOR_METEOR_YELLOW, gMonPalette_MiniorMeteor), + SPECIES_PAL(MINIOR_METEOR_GREEN, gMonPalette_MiniorMeteor), + SPECIES_PAL(MINIOR_METEOR_BLUE, gMonPalette_MiniorMeteor), + SPECIES_PAL(MINIOR_METEOR_INDIGO, gMonPalette_MiniorMeteor), + SPECIES_PAL(MINIOR_METEOR_VIOLET, gMonPalette_MiniorMeteor), SPECIES_PAL(MINIOR_CORE_RED, gMonPalette_MiniorCoreRed), SPECIES_PAL(MINIOR_CORE_ORANGE, gMonPalette_MiniorCoreOrange), SPECIES_PAL(MINIOR_CORE_YELLOW, gMonPalette_MiniorCoreYellow), @@ -1367,7 +1367,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(ALCREMIE_GIGANTAMAX, gMonPalette_AlcremieGigantamax), SPECIES_PAL(COPPERAJAH_GIGANTAMAX, gMonPalette_CopperajahGigantamax), SPECIES_PAL(DURALUDON_GIGANTAMAX, gMonPalette_DuraludonGigantamax), - SPECIES_PAL(URSHIFU_GIGANTAMAX, gMonPalette_UrshifuGigantamax), + SPECIES_PAL(URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX, gMonPalette_UrshifuSingleStrikeGigantamax), SPECIES_PAL(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, gMonPalette_UrshifuRapidStrikeGigantamax), #endif SPECIES_PAL(EGG, gMonPalette_Egg), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 02d404add3..44a140a8da 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -360,7 +360,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(ARON, gMonShinyPalette_Aron), SPECIES_SHINY_PAL(LAIRON, gMonShinyPalette_Lairon), SPECIES_SHINY_PAL(AGGRON, gMonShinyPalette_Aggron), - SPECIES_SHINY_PAL(CASTFORM, gMonShinyPalette_Castform), + SPECIES_SHINY_PAL(CASTFORM_NORMAL, gMonShinyPalette_CastformNormal), SPECIES_SHINY_PAL(VOLBEAT, gMonShinyPalette_Volbeat), SPECIES_SHINY_PAL(ILLUMISE, gMonShinyPalette_Illumise), SPECIES_SHINY_PAL(LILEEP, gMonShinyPalette_Lileep), @@ -385,7 +385,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(LATIAS, gMonShinyPalette_Latias), SPECIES_SHINY_PAL(LATIOS, gMonShinyPalette_Latios), SPECIES_SHINY_PAL(JIRACHI, gMonShinyPalette_Jirachi), - SPECIES_SHINY_PAL(DEOXYS, gMonShinyPalette_Deoxys), + SPECIES_SHINY_PAL(DEOXYS_NORMAL, gMonShinyPalette_DeoxysNormal), SPECIES_SHINY_PAL(CHIMECHO, gMonShinyPalette_Chimecho), #if P_GEN_4_POKEMON == TRUE SPECIES_SHINY_PAL(TURTWIG, gMonShinyPalette_Turtwig), @@ -413,8 +413,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(RAMPARDOS, gMonShinyPalette_Rampardos), SPECIES_SHINY_PAL(SHIELDON, gMonShinyPalette_Shieldon), SPECIES_SHINY_PAL(BASTIODON, gMonShinyPalette_Bastiodon), - SPECIES_SHINY_PAL(BURMY, gMonShinyPalette_Burmy), - SPECIES_SHINY_PAL(WORMADAM, gMonShinyPalette_Wormadam), + SPECIES_SHINY_PAL(BURMY_PLANT_CLOAK, gMonShinyPalette_BurmyPlantCloak), + SPECIES_SHINY_PAL(WORMADAM_PLANT_CLOAK, gMonShinyPalette_WormadamPlantCloak), SPECIES_SHINY_PAL(MOTHIM, gMonShinyPalette_Mothim), SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee), SPECIES_SHINY_PAL(VESPIQUEN, gMonShinyPalette_Vespiquen), @@ -422,9 +422,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(BUIZEL, gMonShinyPalette_Buizel), SPECIES_SHINY_PAL(FLOATZEL, gMonShinyPalette_Floatzel), SPECIES_SHINY_PAL(CHERUBI, gMonShinyPalette_Cherubi), - SPECIES_SHINY_PAL(CHERRIM, gMonShinyPalette_Cherrim), - SPECIES_SHINY_PAL(SHELLOS, gMonShinyPalette_Shellos), - SPECIES_SHINY_PAL(GASTRODON, gMonShinyPalette_Gastrodon), + SPECIES_SHINY_PAL(CHERRIM_OVERCAST, gMonShinyPalette_CherrimOvercast), + SPECIES_SHINY_PAL(SHELLOS_WEST_SEA, gMonShinyPalette_ShellosWestSea), + SPECIES_SHINY_PAL(GASTRODON_WEST_SEA, gMonShinyPalette_GastrodonWestSea), SPECIES_SHINY_PAL(AMBIPOM, gMonShinyPalette_Ambipom), SPECIES_SHINY_PAL(DRIFLOON, gMonShinyPalette_Drifloon), SPECIES_SHINY_PAL(DRIFBLIM, gMonShinyPalette_Drifblim), @@ -488,12 +488,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(PALKIA, gMonShinyPalette_Palkia), SPECIES_SHINY_PAL(HEATRAN, gMonShinyPalette_Heatran), SPECIES_SHINY_PAL(REGIGIGAS, gMonShinyPalette_Regigigas), - SPECIES_SHINY_PAL(GIRATINA, gMonShinyPalette_Giratina), + SPECIES_SHINY_PAL(GIRATINA_ALTERED, gMonShinyPalette_GiratinaAltered), SPECIES_SHINY_PAL(CRESSELIA, gMonShinyPalette_Cresselia), SPECIES_SHINY_PAL(PHIONE, gMonShinyPalette_Phione), SPECIES_SHINY_PAL(MANAPHY, gMonShinyPalette_Manaphy), SPECIES_SHINY_PAL(DARKRAI, gMonShinyPalette_Darkrai), - SPECIES_SHINY_PAL(SHAYMIN, gMonShinyPalette_Shaymin), + SPECIES_SHINY_PAL(SHAYMIN_LAND, gMonShinyPalette_ShayminLand), SPECIES_SHINY_PAL(ARCEUS, gMonShinyPalette_Arceus), #endif #if P_GEN_5_POKEMON == TRUE @@ -553,12 +553,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(WHIMSICOTT, gMonShinyPalette_Whimsicott), SPECIES_SHINY_PAL(PETILIL, gMonShinyPalette_Petilil), SPECIES_SHINY_PAL(LILLIGANT, gMonShinyPalette_Lilligant), - SPECIES_SHINY_PAL(BASCULIN, gMonShinyPalette_Basculin), + SPECIES_SHINY_PAL(BASCULIN, gMonShinyPalette_BasculinRedStriped), SPECIES_SHINY_PAL(SANDILE, gMonShinyPalette_Sandile), SPECIES_SHINY_PAL(KROKOROK, gMonShinyPalette_Krokorok), SPECIES_SHINY_PAL(KROOKODILE, gMonShinyPalette_Krookodile), SPECIES_SHINY_PAL(DARUMAKA, gMonShinyPalette_Darumaka), - SPECIES_SHINY_PAL(DARMANITAN, gMonShinyPalette_Darmanitan), + SPECIES_SHINY_PAL(DARMANITAN_STANDARD_MODE, gMonShinyPalette_DarmanitanStandardMode), SPECIES_SHINY_PAL(MARACTUS, gMonShinyPalette_Maractus), SPECIES_SHINY_PAL(DWEBBLE, gMonShinyPalette_Dwebble), SPECIES_SHINY_PAL(CRUSTLE, gMonShinyPalette_Crustle), @@ -588,8 +588,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(VANILLITE, gMonShinyPalette_Vanillite), SPECIES_SHINY_PAL(VANILLISH, gMonShinyPalette_Vanillish), SPECIES_SHINY_PAL(VANILLUXE, gMonShinyPalette_Vanilluxe), - SPECIES_SHINY_PAL(DEERLING, gMonShinyPalette_Deerling), - SPECIES_SHINY_PAL(SAWSBUCK, gMonShinyPalette_Sawsbuck), + SPECIES_SHINY_PAL(DEERLING_SPRING, gMonShinyPalette_DeerlingSpring), + SPECIES_SHINY_PAL(SAWSBUCK_SPRING, gMonShinyPalette_SawsbuckSpring), SPECIES_SHINY_PAL(EMOLGA, gMonShinyPalette_Emolga), SPECIES_SHINY_PAL(KARRABLAST, gMonShinyPalette_Karrablast), SPECIES_SHINY_PAL(ESCAVALIER, gMonShinyPalette_Escavalier), @@ -644,14 +644,14 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(COBALION, gMonShinyPalette_Cobalion), SPECIES_SHINY_PAL(TERRAKION, gMonShinyPalette_Terrakion), SPECIES_SHINY_PAL(VIRIZION, gMonShinyPalette_Virizion), - SPECIES_SHINY_PAL(TORNADUS, gMonShinyPalette_Tornadus), - SPECIES_SHINY_PAL(THUNDURUS, gMonShinyPalette_Thundurus), + SPECIES_SHINY_PAL(TORNADUS_INCARNATE, gMonShinyPalette_TornadusIncarnate), + SPECIES_SHINY_PAL(THUNDURUS_INCARNATE, gMonShinyPalette_ThundurusIncarnate), SPECIES_SHINY_PAL(RESHIRAM, gMonShinyPalette_Reshiram), SPECIES_SHINY_PAL(ZEKROM, gMonShinyPalette_Zekrom), - SPECIES_SHINY_PAL(LANDORUS, gMonShinyPalette_Landorus), + SPECIES_SHINY_PAL(LANDORUS_INCARNATE, gMonShinyPalette_LandorusIncarnate), SPECIES_SHINY_PAL(KYUREM, gMonShinyPalette_Kyurem), - SPECIES_SHINY_PAL(KELDEO, gMonShinyPalette_Keldeo), - SPECIES_SHINY_PAL(MELOETTA, gMonShinyPalette_Meloetta), + SPECIES_SHINY_PAL(KELDEO_ORDINARY, gMonShinyPalette_KeldeoOrdinary), + SPECIES_SHINY_PAL(MELOETTA, gMonShinyPalette_MeloettaAria), SPECIES_SHINY_PAL(GENESECT, gMonShinyPalette_Genesect), #endif #if P_GEN_6_POKEMON == TRUE @@ -671,22 +671,22 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(TALONFLAME, gMonShinyPalette_Talonflame), SPECIES_SHINY_PAL(SCATTERBUG, gMonShinyPalette_Scatterbug), SPECIES_SHINY_PAL(SPEWPA, gMonShinyPalette_Spewpa), - SPECIES_SHINY_PAL(VIVILLON, gMonShinyPalette_Vivillon), + SPECIES_SHINY_PAL(VIVILLON_ICY_SNOW, gMonShinyPalette_VivillonIcySnow), SPECIES_SHINY_PAL(LITLEO, gMonShinyPalette_Litleo), SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_Pyroar), - SPECIES_SHINY_PAL(FLABEBE, gMonShinyPalette_Flabebe), - SPECIES_SHINY_PAL(FLOETTE, gMonShinyPalette_Floette), - SPECIES_SHINY_PAL(FLORGES, gMonShinyPalette_Florges), + SPECIES_SHINY_PAL(FLABEBE_RED_FLOWER, gMonShinyPalette_FlabebeRedFlower), + SPECIES_SHINY_PAL(FLOETTE_RED_FLOWER, gMonShinyPalette_FloetteRedFlower), + SPECIES_SHINY_PAL(FLORGES_RED_FLOWER, gMonShinyPalette_FlorgesRedFlower), SPECIES_SHINY_PAL(SKIDDO, gMonShinyPalette_Skiddo), SPECIES_SHINY_PAL(GOGOAT, gMonShinyPalette_Gogoat), SPECIES_SHINY_PAL(PANCHAM, gMonShinyPalette_Pancham), SPECIES_SHINY_PAL(PANGORO, gMonShinyPalette_Pangoro), - SPECIES_SHINY_PAL(FURFROU, gMonShinyPalette_Furfrou), + SPECIES_SHINY_PAL(FURFROU_NATURAL, gMonShinyPalette_FurfrouNatural), SPECIES_SHINY_PAL(ESPURR, gMonShinyPalette_Espurr), - SPECIES_SHINY_PAL(MEOWSTIC, gMonShinyPalette_Meowstic), + SPECIES_SHINY_PAL(MEOWSTIC_MALE, gMonShinyPalette_MeowsticMale), SPECIES_SHINY_PAL(HONEDGE, gMonShinyPalette_Honedge), SPECIES_SHINY_PAL(DOUBLADE, gMonShinyPalette_Doublade), - SPECIES_SHINY_PAL(AEGISLASH, gMonShinyPalette_Aegislash), + SPECIES_SHINY_PAL(AEGISLASH_SHIELD, gMonShinyPalette_AegislashShield), SPECIES_SHINY_PAL(SPRITZEE, gMonShinyPalette_Spritzee), SPECIES_SHINY_PAL(AROMATISSE, gMonShinyPalette_Aromatisse), SPECIES_SHINY_PAL(SWIRLIX, gMonShinyPalette_Swirlix), @@ -715,17 +715,17 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(KLEFKI, gMonShinyPalette_Klefki), SPECIES_SHINY_PAL(PHANTUMP, gMonShinyPalette_Phantump), SPECIES_SHINY_PAL(TREVENANT, gMonShinyPalette_Trevenant), - SPECIES_SHINY_PAL(PUMPKABOO, gMonShinyPalette_Pumpkaboo), - SPECIES_SHINY_PAL(GOURGEIST, gMonShinyPalette_Gourgeist), + SPECIES_SHINY_PAL(PUMPKABOO_AVERAGE, gMonShinyPalette_Pumpkaboo), + SPECIES_SHINY_PAL(GOURGEIST_AVERAGE, gMonShinyPalette_Gourgeist), SPECIES_SHINY_PAL(BERGMITE, gMonShinyPalette_Bergmite), SPECIES_SHINY_PAL(AVALUGG, gMonShinyPalette_Avalugg), SPECIES_SHINY_PAL(NOIBAT, gMonShinyPalette_Noibat), SPECIES_SHINY_PAL(NOIVERN, gMonShinyPalette_Noivern), - SPECIES_SHINY_PAL(XERNEAS, gMonShinyPalette_Xerneas), + SPECIES_SHINY_PAL(XERNEAS_NEUTRAL, gMonShinyPalette_XerneasNeutral), SPECIES_SHINY_PAL(YVELTAL, gMonShinyPalette_Yveltal), - SPECIES_SHINY_PAL(ZYGARDE, gMonShinyPalette_Zygarde), + SPECIES_SHINY_PAL(ZYGARDE_50_AURA_BREAK, gMonShinyPalette_Zygarde50), SPECIES_SHINY_PAL(DIANCIE, gMonShinyPalette_Diancie), - SPECIES_SHINY_PAL(HOOPA, gMonShinyPalette_Hoopa), + SPECIES_SHINY_PAL(HOOPA_CONFINED, gMonShinyPalette_HoopaConfined), SPECIES_SHINY_PAL(VOLCANION, gMonShinyPalette_Volcanion), #endif #if P_GEN_7_POKEMON == TRUE @@ -748,12 +748,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(VIKAVOLT, gMonShinyPalette_Vikavolt), SPECIES_SHINY_PAL(CRABRAWLER, gMonShinyPalette_Crabrawler), SPECIES_SHINY_PAL(CRABOMINABLE, gMonShinyPalette_Crabominable), - SPECIES_SHINY_PAL(ORICORIO, gMonShinyPalette_Oricorio), + SPECIES_SHINY_PAL(ORICORIO_BAILE, gMonShinyPalette_OricorioBaile), SPECIES_SHINY_PAL(CUTIEFLY, gMonShinyPalette_Cutiefly), SPECIES_SHINY_PAL(RIBOMBEE, gMonShinyPalette_Ribombee), SPECIES_SHINY_PAL(ROCKRUFF, gMonShinyPalette_Rockruff), - SPECIES_SHINY_PAL(LYCANROC, gMonShinyPalette_Lycanroc), - SPECIES_SHINY_PAL(WISHIWASHI, gMonShinyPalette_Wishiwashi), + SPECIES_SHINY_PAL(LYCANROC_MIDDAY, gMonShinyPalette_LycanrocMidday), + SPECIES_SHINY_PAL(WISHIWASHI_SOLO, gMonShinyPalette_WishiwashiSolo), SPECIES_SHINY_PAL(MAREANIE, gMonShinyPalette_Mareanie), SPECIES_SHINY_PAL(TOXAPEX, gMonShinyPalette_Toxapex), SPECIES_SHINY_PAL(MUDBRAY, gMonShinyPalette_Mudbray), @@ -780,12 +780,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(PALOSSAND, gMonShinyPalette_Palossand), SPECIES_SHINY_PAL(PYUKUMUKU, gMonShinyPalette_Pyukumuku), SPECIES_SHINY_PAL(TYPE_NULL, gMonShinyPalette_TypeNull), - SPECIES_SHINY_PAL(SILVALLY, gMonShinyPalette_Silvally), - SPECIES_SHINY_PAL(MINIOR, gMonShinyPalette_Minior), + SPECIES_SHINY_PAL(SILVALLY_NORMAL, gMonShinyPalette_SilvallyNormal), + SPECIES_SHINY_PAL(MINIOR_METEOR_RED, gMonShinyPalette_MiniorMeteor), SPECIES_SHINY_PAL(KOMALA, gMonShinyPalette_Komala), SPECIES_SHINY_PAL(TURTONATOR, gMonShinyPalette_Turtonator), SPECIES_SHINY_PAL(TOGEDEMARU, gMonShinyPalette_Togedemaru), - SPECIES_SHINY_PAL(MIMIKYU, gMonShinyPalette_Mimikyu), + SPECIES_SHINY_PAL(MIMIKYU_DISGUISED, gMonShinyPalette_MimikyuDisguised), SPECIES_SHINY_PAL(BRUXISH, gMonShinyPalette_Bruxish), SPECIES_SHINY_PAL(DRAMPA, gMonShinyPalette_Drampa), SPECIES_SHINY_PAL(DHELMISE, gMonShinyPalette_Dhelmise), @@ -858,13 +858,13 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(ARROKUDA, gMonShinyPalette_Arrokuda), SPECIES_SHINY_PAL(BARRASKEWDA, gMonShinyPalette_Barraskewda), SPECIES_SHINY_PAL(TOXEL, gMonShinyPalette_Toxel), - SPECIES_SHINY_PAL(TOXTRICITY, gMonShinyPalette_Toxtricity), + SPECIES_SHINY_PAL(TOXTRICITY_AMPED, gMonShinyPalette_ToxtricityAmped), SPECIES_SHINY_PAL(SIZZLIPEDE, gMonShinyPalette_Sizzlipede), SPECIES_SHINY_PAL(CENTISKORCH, gMonShinyPalette_Centiskorch), SPECIES_SHINY_PAL(CLOBBOPUS, gMonShinyPalette_Clobbopus), SPECIES_SHINY_PAL(GRAPPLOCT, gMonShinyPalette_Grapploct), - SPECIES_SHINY_PAL(SINISTEA, gMonShinyPalette_Sinistea), - SPECIES_SHINY_PAL(POLTEAGEIST, gMonShinyPalette_Polteageist), + SPECIES_SHINY_PAL(SINISTEA_PHONY, gMonShinyPalette_Sinistea), + SPECIES_SHINY_PAL(POLTEAGEIST_PHONY, gMonShinyPalette_Polteageist), SPECIES_SHINY_PAL(HATENNA, gMonShinyPalette_Hatenna), SPECIES_SHINY_PAL(HATTREM, gMonShinyPalette_Hattrem), SPECIES_SHINY_PAL(HATTERENE, gMonShinyPalette_Hatterene), @@ -884,9 +884,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(SNOM, gMonShinyPalette_Snom), SPECIES_SHINY_PAL(FROSMOTH, gMonShinyPalette_Frosmoth), SPECIES_SHINY_PAL(STONJOURNER, gMonShinyPalette_Stonjourner), - SPECIES_SHINY_PAL(EISCUE, gMonShinyPalette_Eiscue), - SPECIES_SHINY_PAL(INDEEDEE, gMonShinyPalette_Indeedee), - SPECIES_SHINY_PAL(MORPEKO, gMonShinyPalette_Morpeko), + SPECIES_SHINY_PAL(EISCUE_ICE_FACE, gMonShinyPalette_EiscueIceFace), + SPECIES_SHINY_PAL(INDEEDEE_MALE, gMonShinyPalette_IndeedeeMale), + SPECIES_SHINY_PAL(MORPEKO_FULL_BELLY, gMonShinyPalette_MorpekoFullBelly), SPECIES_SHINY_PAL(CUFANT, gMonShinyPalette_Cufant), SPECIES_SHINY_PAL(COPPERAJAH, gMonShinyPalette_Copperajah), SPECIES_SHINY_PAL(DRACOZOLT, gMonShinyPalette_Dracozolt), @@ -897,11 +897,11 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(DREEPY, gMonShinyPalette_Dreepy), SPECIES_SHINY_PAL(DRAKLOAK, gMonShinyPalette_Drakloak), SPECIES_SHINY_PAL(DRAGAPULT, gMonShinyPalette_Dragapult), - SPECIES_SHINY_PAL(ZACIAN, gMonShinyPalette_Zacian), - SPECIES_SHINY_PAL(ZAMAZENTA, gMonShinyPalette_Zamazenta), + SPECIES_SHINY_PAL(ZACIAN_HERO_OF_MANY_BATTLES, gMonShinyPalette_ZacianHeroOfManyBattles), + SPECIES_SHINY_PAL(ZAMAZENTA_HERO_OF_MANY_BATTLES, gMonShinyPalette_ZamazentaHeroOfManyBattles), SPECIES_SHINY_PAL(ETERNATUS, gMonShinyPalette_Eternatus), SPECIES_SHINY_PAL(KUBFU, gMonShinyPalette_Kubfu), - SPECIES_SHINY_PAL(URSHIFU, gMonShinyPalette_Urshifu), + SPECIES_SHINY_PAL(URSHIFU_SINGLE_STRIKE_STYLE, gMonShinyPalette_UrshifuSingleStrikeStyle), SPECIES_SHINY_PAL(ZARUDE, gMonShinyPalette_Zarude), SPECIES_SHINY_PAL(REGIELEKI, gMonShinyPalette_Regieleki), SPECIES_SHINY_PAL(REGIDRAGO, gMonShinyPalette_Regidrago), @@ -911,10 +911,10 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_Wyrdeer), SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_Kleavor), SPECIES_SHINY_PAL(URSALUNA, gMonShinyPalette_Ursaluna), - SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_Basculegion), + SPECIES_SHINY_PAL(BASCULEGION_MALE, gMonShinyPalette_BasculegionMale), SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_Sneasler), SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_Overqwil), - SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_Enamorus), + SPECIES_SHINY_PAL(ENAMORUS_INCARNATE, gMonShinyPalette_EnamorusIncarnate), #endif SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega), @@ -1011,7 +1011,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(LINOONE_GALARIAN, gMonShinyPalette_LinooneGalarian), #if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(DARUMAKA_GALARIAN, gMonShinyPalette_DarumakaGalarian), - SPECIES_SHINY_PAL(DARMANITAN_GALARIAN, gMonShinyPalette_DarmanitanGalarian), + SPECIES_SHINY_PAL(DARMANITAN_GALARIAN_STANDARD_MODE, gMonShinyPalette_DarmanitanGalarianStandardMode), SPECIES_SHINY_PAL(YAMASK_GALARIAN, gMonShinyPalette_YamaskGalarian), SPECIES_SHINY_PAL(STUNFISK_GALARIAN, gMonShinyPalette_StunfiskGalarian), #endif @@ -1140,7 +1140,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(BASCULIN_WHITE_STRIPED, gMonShinyPalette_BasculinWhiteStriped), SPECIES_SHINY_PAL(DARMANITAN_ZEN_MODE, gMonShinyPalette_DarmanitanZenMode), - SPECIES_SHINY_PAL(DARMANITAN_ZEN_MODE_GALARIAN, gMonShinyPalette_DarmanitanZenModeGalarian), + SPECIES_SHINY_PAL(DARMANITAN_GALARIAN_ZEN_MODE, gMonShinyPalette_DarmanitanGalarianZenMode), SPECIES_SHINY_PAL(DEERLING_SUMMER, gMonShinyPalette_DeerlingSummer), SPECIES_SHINY_PAL(DEERLING_AUTUMN, gMonShinyPalette_DeerlingAutumn), @@ -1232,7 +1232,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(ZYGARDE_10, gMonShinyPalette_Zygarde10), SPECIES_SHINY_PAL(ZYGARDE_10_POWER_CONSTRUCT, gMonShinyPalette_Zygarde10), - SPECIES_SHINY_PAL(ZYGARDE_50_POWER_CONSTRUCT, gMonShinyPalette_Zygarde), + SPECIES_SHINY_PAL(ZYGARDE_50_POWER_CONSTRUCT, gMonShinyPalette_Zygarde50), SPECIES_SHINY_PAL(ZYGARDE_COMPLETE, gMonShinyPalette_ZygardeComplete), SPECIES_SHINY_PAL(HOOPA_UNBOUND, gMonShinyPalette_HoopaUnbound), @@ -1268,12 +1268,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(SILVALLY_DARK, gMonShinyPalette_SilvallyDark), SPECIES_SHINY_PAL(SILVALLY_FAIRY, gMonShinyPalette_SilvallyFairy), - SPECIES_SHINY_PAL(MINIOR_METEOR_ORANGE, gMonShinyPalette_Minior), - SPECIES_SHINY_PAL(MINIOR_METEOR_YELLOW, gMonShinyPalette_Minior), - SPECIES_SHINY_PAL(MINIOR_METEOR_GREEN, gMonShinyPalette_Minior), - SPECIES_SHINY_PAL(MINIOR_METEOR_BLUE, gMonShinyPalette_Minior), - SPECIES_SHINY_PAL(MINIOR_METEOR_INDIGO, gMonShinyPalette_Minior), - SPECIES_SHINY_PAL(MINIOR_METEOR_VIOLET, gMonShinyPalette_Minior), + SPECIES_SHINY_PAL(MINIOR_METEOR_ORANGE, gMonShinyPalette_MiniorMeteor), + SPECIES_SHINY_PAL(MINIOR_METEOR_YELLOW, gMonShinyPalette_MiniorMeteor), + SPECIES_SHINY_PAL(MINIOR_METEOR_GREEN, gMonShinyPalette_MiniorMeteor), + SPECIES_SHINY_PAL(MINIOR_METEOR_BLUE, gMonShinyPalette_MiniorMeteor), + SPECIES_SHINY_PAL(MINIOR_METEOR_INDIGO, gMonShinyPalette_MiniorMeteor), + SPECIES_SHINY_PAL(MINIOR_METEOR_VIOLET, gMonShinyPalette_MiniorMeteor), SPECIES_SHINY_PAL(MINIOR_CORE_RED, gMonShinyPalette_MiniorCore), SPECIES_SHINY_PAL(MINIOR_CORE_ORANGE, gMonShinyPalette_MiniorCore), SPECIES_SHINY_PAL(MINIOR_CORE_YELLOW, gMonShinyPalette_MiniorCore), @@ -1366,7 +1366,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(ALCREMIE_GIGANTAMAX, gMonShinyPalette_AlcremieGigantamax), SPECIES_SHINY_PAL(COPPERAJAH_GIGANTAMAX, gMonShinyPalette_CopperajahGigantamax), SPECIES_SHINY_PAL(DURALUDON_GIGANTAMAX, gMonShinyPalette_DuraludonGigantamax), - SPECIES_SHINY_PAL(URSHIFU_GIGANTAMAX, gMonShinyPalette_UrshifuGigantamax), + SPECIES_SHINY_PAL(URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX, gMonShinyPalette_UrshifuSingleStrikeGigantamax), SPECIES_SHINY_PAL(URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, gMonShinyPalette_UrshifuRapidStrikeGigantamax), #endif SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index de48c6cae9..d9da9fd9e8 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -350,7 +350,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ARMALDO] = _("Armaldo"), [SPECIES_FEEBAS] = _("Feebas"), [SPECIES_MILOTIC] = _("Milotic"), - [SPECIES_CASTFORM] = _("Castform"), + [SPECIES_CASTFORM_NORMAL] = _("Castform"), [SPECIES_KECLEON] = _("Kecleon"), [SPECIES_SHUPPET] = _("Shuppet"), [SPECIES_BANETTE] = _("Banette"), @@ -385,7 +385,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_GROUDON] = _("Groudon"), [SPECIES_RAYQUAZA] = _("Rayquaza"), [SPECIES_JIRACHI] = _("Jirachi"), - [SPECIES_DEOXYS] = _("Deoxys"), + [SPECIES_DEOXYS_NORMAL] = _("Deoxys"), #if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = _("Turtwig"), [SPECIES_GROTLE] = _("Grotle"), @@ -412,8 +412,8 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_RAMPARDOS] = _("Rampardos"), [SPECIES_SHIELDON] = _("Shieldon"), [SPECIES_BASTIODON] = _("Bastiodon"), - [SPECIES_BURMY] = _("Burmy"), - [SPECIES_WORMADAM] = _("Wormadam"), + [SPECIES_BURMY_PLANT_CLOAK] = _("Burmy"), + [SPECIES_WORMADAM_PLANT_CLOAK] = _("Wormadam"), [SPECIES_MOTHIM] = _("Mothim"), [SPECIES_COMBEE] = _("Combee"), [SPECIES_VESPIQUEN] = _("Vespiquen"), @@ -421,9 +421,9 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BUIZEL] = _("Buizel"), [SPECIES_FLOATZEL] = _("Floatzel"), [SPECIES_CHERUBI] = _("Cherubi"), - [SPECIES_CHERRIM] = _("Cherrim"), - [SPECIES_SHELLOS] = _("Shellos"), - [SPECIES_GASTRODON] = _("Gastrodon"), + [SPECIES_CHERRIM_OVERCAST] = _("Cherrim"), + [SPECIES_SHELLOS_WEST_SEA] = _("Shellos"), + [SPECIES_GASTRODON_WEST_SEA] = _("Gastrodon"), [SPECIES_AMBIPOM] = _("Ambipom"), [SPECIES_DRIFLOON] = _("Drifloon"), [SPECIES_DRIFBLIM] = _("Drifblim"), @@ -487,13 +487,13 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_PALKIA] = _("Palkia"), [SPECIES_HEATRAN] = _("Heatran"), [SPECIES_REGIGIGAS] = _("Regigigas"), - [SPECIES_GIRATINA] = _("Giratina"), + [SPECIES_GIRATINA_ALTERED] = _("Giratina"), [SPECIES_CRESSELIA] = _("Cresselia"), [SPECIES_PHIONE] = _("Phione"), [SPECIES_MANAPHY] = _("Manaphy"), [SPECIES_DARKRAI] = _("Darkrai"), - [SPECIES_SHAYMIN] = _("Shaymin"), - [SPECIES_ARCEUS] = _("Arceus"), + [SPECIES_SHAYMIN_LAND] = _("Shaymin"), + [SPECIES_ARCEUS_NORMAL] = _("Arceus"), #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = _("Victini"), @@ -552,12 +552,12 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_WHIMSICOTT] = _("Whimsicott"), [SPECIES_PETILIL] = _("Petilil"), [SPECIES_LILLIGANT] = _("Lilligant"), - [SPECIES_BASCULIN] = _("Basculin"), + [SPECIES_BASCULIN_RED_STRIPED] = _("Basculin"), [SPECIES_SANDILE] = _("Sandile"), [SPECIES_KROKOROK] = _("Krokorok"), [SPECIES_KROOKODILE] = _("Krookodile"), [SPECIES_DARUMAKA] = _("Darumaka"), - [SPECIES_DARMANITAN] = _("Darmanitan"), + [SPECIES_DARMANITAN_STANDARD_MODE] = _("Darmanitan"), [SPECIES_MARACTUS] = _("Maractus"), [SPECIES_DWEBBLE] = _("Dwebble"), [SPECIES_CRUSTLE] = _("Crustle"), @@ -587,8 +587,8 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_VANILLITE] = _("Vanillite"), [SPECIES_VANILLISH] = _("Vanillish"), [SPECIES_VANILLUXE] = _("Vanilluxe"), - [SPECIES_DEERLING] = _("Deerling"), - [SPECIES_SAWSBUCK] = _("Sawsbuck"), + [SPECIES_DEERLING_SPRING] = _("Deerling"), + [SPECIES_SAWSBUCK_SPRING] = _("Sawsbuck"), [SPECIES_EMOLGA] = _("Emolga"), [SPECIES_KARRABLAST] = _("Karrablast"), [SPECIES_ESCAVALIER] = _("Escavalier"), @@ -643,14 +643,14 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_COBALION] = _("Cobalion"), [SPECIES_TERRAKION] = _("Terrakion"), [SPECIES_VIRIZION] = _("Virizion"), - [SPECIES_TORNADUS] = _("Tornadus"), - [SPECIES_THUNDURUS] = _("Thundurus"), + [SPECIES_TORNADUS_INCARNATE] = _("Tornadus"), + [SPECIES_THUNDURUS_INCARNATE] = _("Thundurus"), [SPECIES_RESHIRAM] = _("Reshiram"), [SPECIES_ZEKROM] = _("Zekrom"), - [SPECIES_LANDORUS] = _("Landorus"), + [SPECIES_LANDORUS_INCARNATE] = _("Landorus"), [SPECIES_KYUREM] = _("Kyurem"), - [SPECIES_KELDEO] = _("Keldeo"), - [SPECIES_MELOETTA] = _("Meloetta"), + [SPECIES_KELDEO_ORDINARY] = _("Keldeo"), + [SPECIES_MELOETTA_ARIA] = _("Meloetta"), [SPECIES_GENESECT] = _("Genesect"), #endif #if P_GEN_6_POKEMON == TRUE @@ -670,22 +670,22 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_TALONFLAME] = _("Talonflame"), [SPECIES_SCATTERBUG] = _("Scatterbug"), [SPECIES_SPEWPA] = _("Spewpa"), - [SPECIES_VIVILLON] = _("Vivillon"), + [SPECIES_VIVILLON_ICY_SNOW] = _("Vivillon"), [SPECIES_LITLEO] = _("Litleo"), [SPECIES_PYROAR] = _("Pyroar"), - [SPECIES_FLABEBE] = _("Flabébé"), - [SPECIES_FLOETTE] = _("Floette"), - [SPECIES_FLORGES] = _("Florges"), + [SPECIES_FLABEBE_RED_FLOWER] = _("Flabébé"), + [SPECIES_FLOETTE_RED_FLOWER] = _("Floette"), + [SPECIES_FLORGES_RED_FLOWER] = _("Florges"), [SPECIES_SKIDDO] = _("Skiddo"), [SPECIES_GOGOAT] = _("Gogoat"), [SPECIES_PANCHAM] = _("Pancham"), [SPECIES_PANGORO] = _("Pangoro"), - [SPECIES_FURFROU] = _("Furfrou"), + [SPECIES_FURFROU_NATURAL] = _("Furfrou"), [SPECIES_ESPURR] = _("Espurr"), - [SPECIES_MEOWSTIC] = _("Meowstic"), + [SPECIES_MEOWSTIC_MALE] = _("Meowstic"), [SPECIES_HONEDGE] = _("Honedge"), [SPECIES_DOUBLADE] = _("Doublade"), - [SPECIES_AEGISLASH] = _("Aegislash"), + [SPECIES_AEGISLASH_SHIELD] = _("Aegislash"), [SPECIES_SPRITZEE] = _("Spritzee"), [SPECIES_AROMATISSE] = _("Aromatisse"), [SPECIES_SWIRLIX] = _("Swirlix"), @@ -714,17 +714,17 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_KLEFKI] = _("Klefki"), [SPECIES_PHANTUMP] = _("Phantump"), [SPECIES_TREVENANT] = _("Trevenant"), - [SPECIES_PUMPKABOO] = _("Pumpkaboo"), - [SPECIES_GOURGEIST] = _("Gourgeist"), + [SPECIES_PUMPKABOO_AVERAGE] = _("Pumpkaboo"), + [SPECIES_GOURGEIST_AVERAGE] = _("Gourgeist"), [SPECIES_BERGMITE] = _("Bergmite"), [SPECIES_AVALUGG] = _("Avalugg"), [SPECIES_NOIBAT] = _("Noibat"), [SPECIES_NOIVERN] = _("Noivern"), - [SPECIES_XERNEAS] = _("Xerneas"), + [SPECIES_XERNEAS_NEUTRAL] = _("Xerneas"), [SPECIES_YVELTAL] = _("Yveltal"), - [SPECIES_ZYGARDE] = _("Zygarde"), + [SPECIES_ZYGARDE_50_AURA_BREAK] = _("Zygarde"), [SPECIES_DIANCIE] = _("Diancie"), - [SPECIES_HOOPA] = _("Hoopa"), + [SPECIES_HOOPA_CONFINED] = _("Hoopa"), [SPECIES_VOLCANION] = _("Volcanion"), #endif #if P_GEN_7_POKEMON == TRUE @@ -747,12 +747,12 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_VIKAVOLT] = _("Vikavolt"), [SPECIES_CRABRAWLER] = _("Crabrawler"), [SPECIES_CRABOMINABLE] = _("Crabminabl"), - [SPECIES_ORICORIO] = _("Oricorio"), + [SPECIES_ORICORIO_BAILE] = _("Oricorio"), [SPECIES_CUTIEFLY] = _("Cutiefly"), [SPECIES_RIBOMBEE] = _("Ribombee"), [SPECIES_ROCKRUFF] = _("Rockruff"), - [SPECIES_LYCANROC] = _("Lycanroc"), - [SPECIES_WISHIWASHI] = _("Wishiwashi"), + [SPECIES_LYCANROC_MIDDAY] = _("Lycanroc"), + [SPECIES_WISHIWASHI_SOLO] = _("Wishiwashi"), [SPECIES_MAREANIE] = _("Mareanie"), [SPECIES_TOXAPEX] = _("Toxapex"), [SPECIES_MUDBRAY] = _("Mudbray"), @@ -779,12 +779,12 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_PALOSSAND] = _("Palossand"), [SPECIES_PYUKUMUKU] = _("Pyukumuku"), [SPECIES_TYPE_NULL] = _("Type: Null"), - [SPECIES_SILVALLY] = _("Silvally"), - [SPECIES_MINIOR] = _("Minior"), + [SPECIES_SILVALLY_NORMAL] = _("Silvally"), + [SPECIES_MINIOR_METEOR_RED] = _("Minior"), [SPECIES_KOMALA] = _("Komala"), [SPECIES_TURTONATOR] = _("Turtonator"), [SPECIES_TOGEDEMARU] = _("Togedemaru"), - [SPECIES_MIMIKYU] = _("Mimikyu"), + [SPECIES_MIMIKYU_DISGUISED] = _("Mimikyu"), [SPECIES_BRUXISH] = _("Bruxish"), [SPECIES_DRAMPA] = _("Drampa"), [SPECIES_DHELMISE] = _("Dhelmise"), @@ -857,13 +857,13 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ARROKUDA] = _("Arrokuda"), [SPECIES_BARRASKEWDA] = _("Barraskewd"), [SPECIES_TOXEL] = _("Toxel"), - [SPECIES_TOXTRICITY] = _("Toxtricity"), + [SPECIES_TOXTRICITY_AMPED] = _("Toxtricity"), [SPECIES_SIZZLIPEDE] = _("Sizzlipede"), [SPECIES_CENTISKORCH] = _("Centiskorc"), [SPECIES_CLOBBOPUS] = _("Clobbopus"), [SPECIES_GRAPPLOCT] = _("Grapploct"), - [SPECIES_SINISTEA] = _("Sinistea"), - [SPECIES_POLTEAGEIST] = _("Polteageis"), + [SPECIES_SINISTEA_PHONY] = _("Sinistea"), + [SPECIES_POLTEAGEIST_PHONY] = _("Polteageis"), [SPECIES_HATENNA] = _("Hatenna"), [SPECIES_HATTREM] = _("Hattrem"), [SPECIES_HATTERENE] = _("Hatterene"), @@ -877,15 +877,15 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MR_RIME] = _("Mr. Rime"), [SPECIES_RUNERIGUS] = _("Runerigus"), [SPECIES_MILCERY] = _("Milcery"), - [SPECIES_ALCREMIE] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = _("Alcremie"), [SPECIES_FALINKS] = _("Falinks"), [SPECIES_PINCURCHIN] = _("Pincurchin"), [SPECIES_SNOM] = _("Snom"), [SPECIES_FROSMOTH] = _("Frosmoth"), [SPECIES_STONJOURNER] = _("Stonjourne"), - [SPECIES_EISCUE] = _("Eiscue"), - [SPECIES_INDEEDEE] = _("Indeedee"), - [SPECIES_MORPEKO] = _("Morpeko"), + [SPECIES_EISCUE_ICE_FACE] = _("Eiscue"), + [SPECIES_INDEEDEE_MALE] = _("Indeedee"), + [SPECIES_MORPEKO_FULL_BELLY] = _("Morpeko"), [SPECIES_CUFANT] = _("Cufant"), [SPECIES_COPPERAJAH] = _("Copperajah"), [SPECIES_DRACOZOLT] = _("Dracozolt"), @@ -896,11 +896,11 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DREEPY] = _("Dreepy"), [SPECIES_DRAKLOAK] = _("Drakloak"), [SPECIES_DRAGAPULT] = _("Dragapult"), - [SPECIES_ZACIAN] = _("Zacian"), - [SPECIES_ZAMAZENTA] = _("Zamazenta"), + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = _("Zacian"), + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = _("Zamazenta"), [SPECIES_ETERNATUS] = _("Eternatus"), [SPECIES_KUBFU] = _("Kubfu"), - [SPECIES_URSHIFU] = _("Urshifu"), + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = _("Urshifu"), [SPECIES_ZARUDE] = _("Zarude"), [SPECIES_REGIELEKI] = _("Regieleki"), [SPECIES_REGIDRAGO] = _("Regidrago"), @@ -910,10 +910,10 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_WYRDEER] = _("Wyrdeer"), [SPECIES_KLEAVOR] = _("Kleavor"), [SPECIES_URSALUNA] = _("Ursaluna"), - [SPECIES_BASCULEGION] = _("Bsculegion"), + [SPECIES_BASCULEGION_MALE] = _("Bsculegion"), [SPECIES_SNEASLER] = _("Sneasler"), [SPECIES_OVERQWIL] = _("Overqwil"), - [SPECIES_ENAMORUS] = _("Enamorus"), + [SPECIES_ENAMORUS_INCARNATE] = _("Enamorus"), #endif // Megas @@ -1013,7 +1013,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_LINOONE_GALARIAN] = _("Linoone"), #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = _("Darumaka"), - [SPECIES_DARMANITAN_GALARIAN] = _("Darmanitan"), + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = _("Darmanitan"), [SPECIES_YAMASK_GALARIAN] = _("Yamask"), [SPECIES_STUNFISK_GALARIAN] = _("Stunfisk"), #endif @@ -1146,7 +1146,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BASCULIN_WHITE_STRIPED] = _("Basculin"), // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = _("Darmanitan"), - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = _("Darmanitan"), + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = _("Darmanitan"), // Deerling [SPECIES_DEERLING_SUMMER] = _("Deerling"), [SPECIES_DEERLING_AUTUMN] = _("Deerling"), @@ -1238,7 +1238,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { // Xerneas [SPECIES_XERNEAS_ACTIVE] = _("Xerneas"), // Zygarde - [SPECIES_ZYGARDE_10] = _("Zygarde"), + [SPECIES_ZYGARDE_10_AURA_BREAK] = _("Zygarde"), [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = _("Zygarde"), [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = _("Zygarde"), [SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"), @@ -1309,14 +1309,14 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = _("Polteageis"), // Alcremie - [SPECIES_ALCREMIE_RUBY_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_MATCHA_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_MINT_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_LEMON_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_SALTED_CREAM] = _("Alcremie"), - [SPECIES_ALCREMIE_RUBY_SWIRL] = _("Alcremie"), - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = _("Alcremie"), - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = _("Alcremie"), + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = _("Alcremie"), // Eiscue [SPECIES_EISCUE_NOICE_FACE] = _("Eiscue"), // Indeedee @@ -1371,7 +1371,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ALCREMIE_GIGANTAMAX] = _("Alcremie"), [SPECIES_COPPERAJAH_GIGANTAMAX] = _("Copperajah"), [SPECIES_DURALUDON_GIGANTAMAX] = _("Duraludon"), - [SPECIES_URSHIFU_GIGANTAMAX] = _("Urshifu"), + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), #endif }; diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index ed53a181dd..b3128781c4 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -5443,7 +5443,7 @@ static const struct TrainerMon sParty_Angelica[] = { { .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 30, - .species = SPECIES_CASTFORM, + .species = SPECIES_CASTFORM_NORMAL, .moves = {MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE} } }; @@ -6224,7 +6224,7 @@ static const struct TrainerMon sParty_Jonas[] = { static const struct TrainerMon sParty_Kayley[] = { { .lvl = 31, - .species = SPECIES_CASTFORM, + .species = SPECIES_CASTFORM_NORMAL, .moves = {MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM} } }; diff --git a/src/daycare.c b/src/daycare.c index c66e10eaab..b00512ca03 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1053,7 +1053,7 @@ static u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parent else if (eggSpecies == SPECIES_MANAPHY) eggSpecies = SPECIES_PHIONE; else if (eggSpecies == SPECIES_SINISTEA_ANTIQUE) - eggSpecies = SPECIES_SINISTEA; + eggSpecies = SPECIES_SINISTEA_PHONY; else if (GET_BASE_SPECIES_ID(eggSpecies) == SPECIES_VIVILLON) eggSpecies = SPECIES_SCATTERBUG; else if (GET_BASE_SPECIES_ID(eggSpecies) == SPECIES_ROTOM) diff --git a/src/pokemon.c b/src/pokemon.c index d2dc6a275a..3eef17995d 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1364,7 +1364,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_LINOONE_GALARIAN - 1] = NATIONAL_DEX_LINOONE, #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN - 1] = NATIONAL_DEX_DARUMAKA, - [SPECIES_DARMANITAN_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE - 1] = NATIONAL_DEX_DARMANITAN, [SPECIES_YAMASK_GALARIAN - 1] = NATIONAL_DEX_YAMASK, [SPECIES_STUNFISK_GALARIAN - 1] = NATIONAL_DEX_STUNFISK, #endif @@ -1495,7 +1495,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [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, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE - 1] = NATIONAL_DEX_DARMANITAN, // Deerling [SPECIES_DEERLING_SUMMER - 1] = NATIONAL_DEX_DEERLING, [SPECIES_DEERLING_AUTUMN - 1] = NATIONAL_DEX_DEERLING, @@ -1586,7 +1586,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = // Xerneas [SPECIES_XERNEAS_ACTIVE - 1] = NATIONAL_DEX_XERNEAS, // Zygarde - [SPECIES_ZYGARDE_10 - 1] = NATIONAL_DEX_ZYGARDE, + [SPECIES_ZYGARDE_10_AURA_BREAK - 1] = NATIONAL_DEX_ZYGARDE, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT - 1] = NATIONAL_DEX_ZYGARDE, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT - 1] = NATIONAL_DEX_ZYGARDE, [SPECIES_ZYGARDE_COMPLETE - 1] = NATIONAL_DEX_ZYGARDE, @@ -1657,14 +1657,14 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE - 1] = NATIONAL_DEX_POLTEAGEIST, // Alcremie - [SPECIES_ALCREMIE_RUBY_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_MATCHA_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_MINT_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_LEMON_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_SALTED_CREAM - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_RUBY_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_CARAMEL_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, - [SPECIES_ALCREMIE_RAINBOW_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL - 1] = NATIONAL_DEX_ALCREMIE, // Eiscue [SPECIES_EISCUE_NOICE_FACE - 1] = NATIONAL_DEX_EISCUE, // Indeedee @@ -1720,7 +1720,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_ALCREMIE_GIGANTAMAX - 1] = NATIONAL_DEX_ALCREMIE, [SPECIES_COPPERAJAH_GIGANTAMAX - 1] = NATIONAL_DEX_COPPERAJAH, [SPECIES_DURALUDON_GIGANTAMAX - 1] = NATIONAL_DEX_DURALUDON, - [SPECIES_URSHIFU_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU, #endif }; @@ -2368,7 +2368,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_ARMALDO - 1] = ANIM_V_SHAKE, [SPECIES_FEEBAS - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, [SPECIES_MILOTIC - 1] = ANIM_CIRCULAR_STRETCH_TWICE, - [SPECIES_CASTFORM - 1] = ANIM_H_SLIDE_WOBBLE, + [SPECIES_CASTFORM_NORMAL - 1] = ANIM_H_SLIDE_WOBBLE, [SPECIES_KECLEON - 1] = ANIM_FLICKER_INCREASING, [SPECIES_SHUPPET - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_BANETTE - 1] = ANIM_CIRCULAR_STRETCH_TWICE, @@ -2403,7 +2403,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_GROUDON - 1] = ANIM_V_SHAKE, [SPECIES_RAYQUAZA - 1] = ANIM_H_SHAKE, [SPECIES_JIRACHI - 1] = ANIM_RISING_WOBBLE, - [SPECIES_DEOXYS - 1] = ANIM_GROW_VIBRATE, + [SPECIES_DEOXYS_NORMAL - 1] = ANIM_GROW_VIBRATE, // Gen 4 [SPECIES_TURTWIG - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2431,8 +2431,8 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_RAMPARDOS - 1] = ANIM_V_SHAKE_TWICE, [SPECIES_SHIELDON - 1] = ANIM_V_SHAKE, [SPECIES_BASTIODON - 1] = ANIM_BACK_AND_LUNGE, - [SPECIES_BURMY - 1] = ANIM_V_STRETCH, - [SPECIES_WORMADAM - 1] = ANIM_SWING_CONVEX_FAST_SHORT, + [SPECIES_BURMY_PLANT_CLOAK - 1] = ANIM_V_STRETCH, + [SPECIES_WORMADAM_PLANT_CLOAK - 1] = ANIM_SWING_CONVEX_FAST_SHORT, [SPECIES_MOTHIM - 1] = ANIM_H_SLIDE_WOBBLE, [SPECIES_COMBEE - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_VESPIQUEN - 1] = ANIM_LUNGE_GROW, @@ -2440,9 +2440,9 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_BUIZEL - 1] = ANIM_GROW_VIBRATE, [SPECIES_FLOATZEL - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_CHERUBI - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_CHERRIM - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, - [SPECIES_SHELLOS - 1] = ANIM_V_STRETCH, - [SPECIES_GASTRODON - 1] = ANIM_CIRCULAR_STRETCH_TWICE, + [SPECIES_CHERRIM_OVERCAST - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, + [SPECIES_SHELLOS_WEST_SEA - 1] = ANIM_V_STRETCH, + [SPECIES_GASTRODON_WEST_SEA - 1] = ANIM_CIRCULAR_STRETCH_TWICE, [SPECIES_AMBIPOM - 1] = ANIM_BACK_AND_LUNGE, [SPECIES_DRIFLOON - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_DRIFBLIM - 1] = ANIM_V_SLIDE_WOBBLE, @@ -2506,13 +2506,13 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_PALKIA - 1] = ANIM_V_SHAKE, [SPECIES_HEATRAN - 1] = ANIM_GLOW_ORANGE, [SPECIES_REGIGIGAS - 1] = ANIM_V_SHAKE, - [SPECIES_GIRATINA - 1] = ANIM_GROW_VIBRATE, + [SPECIES_GIRATINA_ALTERED - 1] = ANIM_GROW_VIBRATE, [SPECIES_CRESSELIA - 1] = ANIM_H_SLIDE_WOBBLE, [SPECIES_PHIONE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_MANAPHY - 1] = ANIM_SWING_CONVEX, [SPECIES_DARKRAI - 1] = ANIM_GLOW_BLACK, - [SPECIES_SHAYMIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ARCEUS - 1] = ANIM_GROW_VIBRATE, + [SPECIES_SHAYMIN_LAND - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ARCEUS_NORMAL - 1] = ANIM_GROW_VIBRATE, // Gen 5 [SPECIES_VICTINI - 1] = ANIM_H_JUMPS, @@ -2571,12 +2571,12 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_WHIMSICOTT - 1] = ANIM_SHRINK_GROW, [SPECIES_PETILIL - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_LILLIGANT - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_BASCULIN - 1] = ANIM_TIP_MOVE_FORWARD, + [SPECIES_BASCULIN_RED_STRIPED - 1] = ANIM_TIP_MOVE_FORWARD, [SPECIES_SANDILE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_KROKOROK - 1] = ANIM_V_STRETCH, [SPECIES_KROOKODILE - 1] = ANIM_SWING_CONCAVE_FAST_SHORT, [SPECIES_DARUMAKA - 1] = ANIM_SWING_CONCAVE, - [SPECIES_DARMANITAN - 1] = ANIM_CIRCULAR_STRETCH_TWICE, + [SPECIES_DARMANITAN_STANDARD_MODE - 1] = ANIM_CIRCULAR_STRETCH_TWICE, [SPECIES_MARACTUS - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_DWEBBLE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CRUSTLE - 1] = ANIM_H_SLIDE_SLOW, @@ -2606,8 +2606,8 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_VANILLITE - 1] = ANIM_H_SLIDE, [SPECIES_VANILLISH - 1] = ANIM_GROW_VIBRATE, [SPECIES_VANILLUXE - 1] = ANIM_GROW_VIBRATE, - [SPECIES_DEERLING - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_SAWSBUCK - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_DEERLING_SPRING - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SAWSBUCK_SPRING - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_EMOLGA - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, [SPECIES_KARRABLAST - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ESCAVALIER - 1] = ANIM_BACK_AND_LUNGE, @@ -2662,14 +2662,14 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_COBALION - 1] = ANIM_V_STRETCH, [SPECIES_TERRAKION - 1] = ANIM_V_SHAKE_TWICE, [SPECIES_VIRIZION - 1] = ANIM_GROW_VIBRATE, - [SPECIES_TORNADUS - 1] = ANIM_FIGURE_8, - [SPECIES_THUNDURUS - 1] = ANIM_FIGURE_8, + [SPECIES_TORNADUS_INCARNATE - 1] = ANIM_FIGURE_8, + [SPECIES_THUNDURUS_INCARNATE - 1] = ANIM_FIGURE_8, [SPECIES_RESHIRAM - 1] = ANIM_V_SHAKE, [SPECIES_ZEKROM - 1] = ANIM_V_SHAKE, - [SPECIES_LANDORUS - 1] = ANIM_FIGURE_8, + [SPECIES_LANDORUS_INCARNATE - 1] = ANIM_FIGURE_8, [SPECIES_KYUREM - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_KELDEO - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_MELOETTA - 1] = ANIM_GROW_VIBRATE, + [SPECIES_KELDEO_ORDINARY - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_MELOETTA_ARIA - 1] = ANIM_GROW_VIBRATE, [SPECIES_GENESECT - 1] = ANIM_H_VIBRATE, // Gen 6 @@ -2689,22 +2689,22 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_TALONFLAME - 1] = ANIM_SWING_CONCAVE_FAST, [SPECIES_SCATTERBUG - 1] = ANIM_V_STRETCH, [SPECIES_SPEWPA - 1] = ANIM_V_SHAKE, - [SPECIES_VIVILLON - 1] = ANIM_ZIGZAG_SLOW, + [SPECIES_VIVILLON_ICY_SNOW - 1] = ANIM_ZIGZAG_SLOW, [SPECIES_LITLEO - 1] = ANIM_BACK_AND_LUNGE, [SPECIES_PYROAR - 1] = ANIM_V_SHAKE, - [SPECIES_FLABEBE - 1] = ANIM_SWING_CONCAVE_FAST_SHORT, - [SPECIES_FLOETTE - 1] = ANIM_V_SLIDE_WOBBLE, - [SPECIES_FLORGES - 1] = ANIM_GROW_VIBRATE, + [SPECIES_FLABEBE_RED_FLOWER - 1] = ANIM_SWING_CONCAVE_FAST_SHORT, + [SPECIES_FLOETTE_RED_FLOWER - 1] = ANIM_V_SLIDE_WOBBLE, + [SPECIES_FLORGES_RED_FLOWER - 1] = ANIM_GROW_VIBRATE, [SPECIES_SKIDDO - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_GOGOAT - 1] = ANIM_V_STRETCH, [SPECIES_PANCHAM - 1] = ANIM_H_STRETCH, [SPECIES_PANGORO - 1] = ANIM_BACK_AND_LUNGE, - [SPECIES_FURFROU - 1] = ANIM_H_SLIDE, + [SPECIES_FURFROU_NATURAL - 1] = ANIM_H_SLIDE, [SPECIES_ESPURR - 1] = ANIM_V_STRETCH, - [SPECIES_MEOWSTIC - 1] = ANIM_GROW_VIBRATE, + [SPECIES_MEOWSTIC_MALE - 1] = ANIM_GROW_VIBRATE, [SPECIES_HONEDGE - 1] = ANIM_SWING_CONVEX, [SPECIES_DOUBLADE - 1] = ANIM_GROW_VIBRATE, - [SPECIES_AEGISLASH - 1] = ANIM_H_VIBRATE, + [SPECIES_AEGISLASH_SHIELD - 1] = ANIM_H_VIBRATE, [SPECIES_SPRITZEE - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_AROMATISSE - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, [SPECIES_SWIRLIX - 1] = ANIM_H_JUMPS_V_STRETCH, @@ -2733,17 +2733,17 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_KLEFKI - 1] = ANIM_FOUR_PETAL, [SPECIES_PHANTUMP - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TREVENANT - 1] = ANIM_H_SLIDE_SLOW, - [SPECIES_PUMPKABOO - 1] = ANIM_V_SLIDE_WOBBLE, - [SPECIES_GOURGEIST - 1] = ANIM_SHRINK_GROW, + [SPECIES_PUMPKABOO_AVERAGE - 1] = ANIM_V_SLIDE_WOBBLE, + [SPECIES_GOURGEIST_AVERAGE - 1] = ANIM_SHRINK_GROW, [SPECIES_BERGMITE - 1] = ANIM_LUNGE_GROW, [SPECIES_AVALUGG - 1] = ANIM_V_SHAKE, [SPECIES_NOIBAT - 1] = ANIM_RISING_WOBBLE, [SPECIES_NOIVERN - 1] = ANIM_V_STRETCH, - [SPECIES_XERNEAS - 1] = ANIM_GROW_VIBRATE, + [SPECIES_XERNEAS_NEUTRAL - 1] = ANIM_GROW_VIBRATE, [SPECIES_YVELTAL - 1] = ANIM_FRONT_FLIP, - [SPECIES_ZYGARDE - 1] = ANIM_TIP_MOVE_FORWARD, + [SPECIES_ZYGARDE_50_AURA_BREAK - 1] = ANIM_TIP_MOVE_FORWARD, [SPECIES_DIANCIE - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_HOOPA - 1] = ANIM_ZIGZAG_SLOW, + [SPECIES_HOOPA_CONFINED - 1] = ANIM_ZIGZAG_SLOW, [SPECIES_VOLCANION - 1] = ANIM_V_SHAKE_TWICE, // Gen 7 @@ -2766,12 +2766,12 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_VIKAVOLT - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES, [SPECIES_CRABRAWLER - 1] = ANIM_V_SHAKE, [SPECIES_CRABOMINABLE - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, - [SPECIES_ORICORIO - 1] = ANIM_CONCAVE_ARC_SMALL, + [SPECIES_ORICORIO_BAILE - 1] = ANIM_CONCAVE_ARC_SMALL, [SPECIES_CUTIEFLY - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_RIBOMBEE - 1] = ANIM_CONVEX_DOUBLE_ARC_TWICE, [SPECIES_ROCKRUFF - 1] = ANIM_V_STRETCH, - [SPECIES_LYCANROC - 1] = ANIM_V_SHAKE, - [SPECIES_WISHIWASHI - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, + [SPECIES_LYCANROC_MIDDAY - 1] = ANIM_V_SHAKE, + [SPECIES_WISHIWASHI_SOLO - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, [SPECIES_MAREANIE - 1] = ANIM_GLOW_PURPLE, [SPECIES_TOXAPEX - 1] = ANIM_SHAKE_GLOW_PURPLE_SLOW, [SPECIES_MUDBRAY - 1] = ANIM_V_SHAKE, @@ -2798,12 +2798,12 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_PALOSSAND - 1] = ANIM_H_VIBRATE, [SPECIES_PYUKUMUKU - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TYPE_NULL - 1] = ANIM_H_SHAKE, - [SPECIES_SILVALLY - 1] = ANIM_V_SHAKE, - [SPECIES_MINIOR - 1] = ANIM_TUMBLING_FRONT_FLIP_TWICE, + [SPECIES_SILVALLY_NORMAL - 1] = ANIM_V_SHAKE, + [SPECIES_MINIOR_METEOR_RED - 1] = ANIM_TUMBLING_FRONT_FLIP_TWICE, [SPECIES_KOMALA - 1] = ANIM_H_DIP, [SPECIES_TURTONATOR - 1] = ANIM_SHAKE_GLOW_RED, [SPECIES_TOGEDEMARU - 1] = ANIM_SHAKE_FLASH_YELLOW, - [SPECIES_MIMIKYU - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, + [SPECIES_MIMIKYU_DISGUISED - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, [SPECIES_BRUXISH - 1] = ANIM_RISING_WOBBLE, [SPECIES_DRAMPA - 1] = ANIM_V_SHAKE, [SPECIES_DHELMISE - 1] = ANIM_SWING_CONVEX, @@ -2876,13 +2876,13 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_ARROKUDA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_BARRASKEWDA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TOXEL - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_TOXTRICITY - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_TOXTRICITY_AMPED - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SIZZLIPEDE - 1] = ANIM_H_VIBRATE, [SPECIES_CENTISKORCH - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CLOBBOPUS - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_GRAPPLOCT - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_SINISTEA - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_POLTEAGEIST - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SINISTEA_PHONY - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_POLTEAGEIST_PHONY - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_HATENNA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_HATTREM - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_HATTERENE - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2896,15 +2896,15 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_MR_RIME - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_RUNERIGUS - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_MILCERY - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ALCREMIE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_FALINKS - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_PINCURCHIN - 1] = ANIM_SHRINK_GROW_VIBRATE, [SPECIES_SNOM - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_FROSMOTH - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_STONJOURNER - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_EISCUE - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_INDEEDEE - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_MORPEKO - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_EISCUE_ICE_FACE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_INDEEDEE_MALE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_MORPEKO_FULL_BELLY - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CUFANT - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_COPPERAJAH - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DRACOZOLT - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2915,11 +2915,11 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_DREEPY - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DRAKLOAK - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DRAGAPULT - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ZACIAN - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ZAMAZENTA - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ETERNATUS - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_KUBFU - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_URSHIFU - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ZARUDE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_REGIELEKI - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_REGIDRAGO - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2929,10 +2929,10 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [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_BASCULEGION_MALE - 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, + [SPECIES_ENAMORUS_INCARNATE - 1] = ANIM_V_SQUISH_AND_BOUNCE, // Gen 3 Forms [SPECIES_CASTFORM_SUNNY - 1] = ANIM_GROW_VIBRATE, @@ -3050,7 +3050,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_GOURGEIST_LARGE - 1] = ANIM_SHRINK_GROW, [SPECIES_GOURGEIST_SUPER - 1] = ANIM_SHRINK_GROW, [SPECIES_XERNEAS_ACTIVE - 1] = ANIM_GROW_VIBRATE, - [SPECIES_ZYGARDE_10 - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ZYGARDE_10_AURA_BREAK - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT - 1] = ANIM_TIP_MOVE_FORWARD, [SPECIES_ZYGARDE_COMPLETE - 1] = ANIM_GROW_VIBRATE, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 958bc3ffeb..1070c22aa8 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -569,7 +569,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_ARMALDO] = BACK_ANIM_V_SHAKE, [SPECIES_FEEBAS] = BACK_ANIM_H_SPRING, [SPECIES_MILOTIC] = BACK_ANIM_SHAKE_GLOW_BLUE, - [SPECIES_CASTFORM] = BACK_ANIM_CONVEX_DOUBLE_ARC, + [SPECIES_CASTFORM_NORMAL] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_KECLEON] = BACK_ANIM_H_VIBRATE, [SPECIES_SHUPPET] = BACK_ANIM_H_VIBRATE, [SPECIES_BANETTE] = BACK_ANIM_H_VIBRATE, @@ -604,7 +604,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_GROUDON] = BACK_ANIM_SHAKE_GLOW_RED, [SPECIES_RAYQUAZA] = BACK_ANIM_GROW_STUTTER, [SPECIES_JIRACHI] = BACK_ANIM_CONVEX_DOUBLE_ARC, - [SPECIES_DEOXYS] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_DEOXYS_NORMAL] = BACK_ANIM_SHRINK_GROW_VIBRATE, // Gen 4 [SPECIES_TURTWIG] = BACK_ANIM_H_SLIDE, @@ -632,8 +632,8 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_RAMPARDOS] = BACK_ANIM_V_SHAKE_LOW, [SPECIES_SHIELDON] = BACK_ANIM_V_SHAKE, [SPECIES_BASTIODON] = BACK_ANIM_V_SHAKE_LOW, - [SPECIES_BURMY] = BACK_ANIM_H_SHAKE, - [SPECIES_WORMADAM] = BACK_ANIM_V_SHAKE, + [SPECIES_BURMY_PLANT_CLOAK] = BACK_ANIM_H_SHAKE, + [SPECIES_WORMADAM_PLANT_CLOAK] = BACK_ANIM_V_SHAKE, [SPECIES_MOTHIM] = BACK_ANIM_H_SHAKE, [SPECIES_COMBEE] = BACK_ANIM_TRIANGLE_DOWN, [SPECIES_VESPIQUEN] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, @@ -641,8 +641,8 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_BUIZEL] = BACK_ANIM_H_SLIDE, [SPECIES_FLOATZEL] = BACK_ANIM_V_STRETCH, [SPECIES_CHERUBI] = BACK_ANIM_CONCAVE_ARC_SMALL, - [SPECIES_CHERRIM] = BACK_ANIM_V_STRETCH, - [SPECIES_SHELLOS] = BACK_ANIM_H_SPRING, + [SPECIES_CHERRIM_OVERCAST] = BACK_ANIM_V_STRETCH, + [SPECIES_SHELLOS_WEST_SEA] = BACK_ANIM_H_SPRING, [SPECIES_GASTRODON] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_AMBIPOM] = BACK_ANIM_CONCAVE_ARC_LARGE, [SPECIES_DRIFLOON] = BACK_ANIM_CONCAVE_ARC_SMALL, @@ -707,13 +707,13 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_PALKIA] = BACK_ANIM_H_SHAKE, [SPECIES_HEATRAN] = BACK_ANIM_SHAKE_GLOW_RED, [SPECIES_REGIGIGAS] = BACK_ANIM_V_SHAKE_LOW, - [SPECIES_GIRATINA] = BACK_ANIM_V_SHAKE_LOW, + [SPECIES_GIRATINA_ALTERED] = BACK_ANIM_V_SHAKE_LOW, [SPECIES_CRESSELIA] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_PHIONE] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_MANAPHY] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_DARKRAI] = BACK_ANIM_SHRINK_GROW_VIBRATE, - [SPECIES_SHAYMIN] = BACK_ANIM_CONCAVE_ARC_SMALL, - [SPECIES_ARCEUS] = BACK_ANIM_GROW, + [SPECIES_SHAYMIN_LAND] = BACK_ANIM_CONCAVE_ARC_SMALL, + [SPECIES_ARCEUS_NORMAL] = BACK_ANIM_GROW, // Gen 5 [SPECIES_VICTINI] = BACK_ANIM_H_SHAKE, @@ -772,12 +772,12 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_WHIMSICOTT] = BACK_ANIM_CONCAVE_ARC_LARGE, [SPECIES_PETILIL] = BACK_ANIM_V_STRETCH, [SPECIES_LILLIGANT] = BACK_ANIM_SHRINK_GROW, - [SPECIES_BASCULIN] = BACK_ANIM_JOLT_RIGHT, + [SPECIES_BASCULIN_RED_STRIPED] = BACK_ANIM_JOLT_RIGHT, [SPECIES_SANDILE] = BACK_ANIM_H_SLIDE, [SPECIES_KROKOROK] = BACK_ANIM_V_STRETCH, [SPECIES_KROOKODILE] = BACK_ANIM_V_SHAKE_LOW, [SPECIES_DARUMAKA] = BACK_ANIM_CONCAVE_ARC_LARGE, - [SPECIES_DARMANITAN] = BACK_ANIM_V_SHAKE_H_SLIDE, + [SPECIES_DARMANITAN_STANDARD_MODE] = BACK_ANIM_V_SHAKE_H_SLIDE, [SPECIES_MARACTUS] = BACK_ANIM_CONCAVE_ARC_LARGE, [SPECIES_DWEBBLE] = BACK_ANIM_H_SLIDE, [SPECIES_CRUSTLE] = BACK_ANIM_V_SHAKE_LOW, @@ -807,8 +807,8 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_VANILLITE] = BACK_ANIM_H_SLIDE, [SPECIES_VANILLISH] = BACK_ANIM_H_SLIDE, [SPECIES_VANILLUXE] = BACK_ANIM_H_SHAKE, - [SPECIES_DEERLING] = BACK_ANIM_H_SLIDE, - [SPECIES_SAWSBUCK] = BACK_ANIM_DIP_RIGHT_SIDE, + [SPECIES_DEERLING_SPRING] = BACK_ANIM_H_SLIDE, + [SPECIES_SAWSBUCK_SPRING] = BACK_ANIM_DIP_RIGHT_SIDE, [SPECIES_EMOLGA] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_KARRABLAST] = BACK_ANIM_CONCAVE_ARC_LARGE, [SPECIES_ESCAVALIER] = BACK_ANIM_JOLT_RIGHT, @@ -863,14 +863,14 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_COBALION] = BACK_ANIM_V_STRETCH, [SPECIES_TERRAKION] = BACK_ANIM_V_SHAKE_LOW, [SPECIES_VIRIZION] = BACK_ANIM_H_SHAKE, - [SPECIES_TORNADUS] = BACK_ANIM_V_SHAKE, - [SPECIES_THUNDURUS] = BACK_ANIM_V_SHAKE, + [SPECIES_TORNADUS_INCARNATE] = BACK_ANIM_V_SHAKE, + [SPECIES_THUNDURUS_INCARNATE] = BACK_ANIM_V_SHAKE, [SPECIES_RESHIRAM] = BACK_ANIM_SHAKE_GLOW_RED, [SPECIES_ZEKROM] = BACK_ANIM_SHAKE_GLOW_BLUE, - [SPECIES_LANDORUS] = BACK_ANIM_V_SHAKE, + [SPECIES_LANDORUS_INCARNATE] = BACK_ANIM_V_SHAKE, [SPECIES_KYUREM] = BACK_ANIM_V_SHAKE_LOW, - [SPECIES_KELDEO] = BACK_ANIM_JOLT_RIGHT, - [SPECIES_MELOETTA] = BACK_ANIM_CONVEX_DOUBLE_ARC, + [SPECIES_KELDEO_ORDINARY] = BACK_ANIM_JOLT_RIGHT, + [SPECIES_MELOETTA_ARIA] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_GENESECT] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, // Gen 6 @@ -890,22 +890,22 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_TALONFLAME] = BACK_ANIM_SHAKE_GLOW_RED, [SPECIES_SCATTERBUG] = BACK_ANIM_H_SLIDE, [SPECIES_SPEWPA] = BACK_ANIM_H_VIBRATE, - [SPECIES_VIVILLON] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, + [SPECIES_VIVILLON_ICY_SNOW] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, [SPECIES_LITLEO] = BACK_ANIM_CONCAVE_ARC_SMALL, [SPECIES_PYROAR] = BACK_ANIM_H_STRETCH, - [SPECIES_FLABEBE] = BACK_ANIM_CONCAVE_ARC_SMALL, - [SPECIES_FLOETTE] = BACK_ANIM_CONVEX_DOUBLE_ARC, - [SPECIES_FLORGES] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_FLABEBE_RED_FLOWER] = BACK_ANIM_CONCAVE_ARC_SMALL, + [SPECIES_FLOETTE_RED_FLOWER] = BACK_ANIM_CONVEX_DOUBLE_ARC, + [SPECIES_FLORGES_RED_FLOWER] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_SKIDDO] = BACK_ANIM_CONCAVE_ARC_SMALL, [SPECIES_GOGOAT] = BACK_ANIM_DIP_RIGHT_SIDE, [SPECIES_PANCHAM] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, [SPECIES_PANGORO] = BACK_ANIM_V_SHAKE_LOW, - [SPECIES_FURFROU] = BACK_ANIM_V_STRETCH, + [SPECIES_FURFROU_NATURAL] = BACK_ANIM_V_STRETCH, [SPECIES_ESPURR] = BACK_ANIM_H_SLIDE, - [SPECIES_MEOWSTIC] = BACK_ANIM_CONCAVE_ARC_LARGE, + [SPECIES_MEOWSTIC_MALE] = BACK_ANIM_CONCAVE_ARC_LARGE, [SPECIES_HONEDGE] = BACK_ANIM_V_SHAKE, [SPECIES_DOUBLADE] = BACK_ANIM_H_SHAKE, - [SPECIES_AEGISLASH] = BACK_ANIM_H_VIBRATE, + [SPECIES_AEGISLASH_SHIELD] = BACK_ANIM_H_VIBRATE, [SPECIES_SPRITZEE] = BACK_ANIM_TRIANGLE_DOWN, [SPECIES_AROMATISSE] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_SWIRLIX] = BACK_ANIM_H_SPRING, @@ -934,17 +934,17 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_KLEFKI] = BACK_ANIM_TRIANGLE_DOWN, [SPECIES_PHANTUMP] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, [SPECIES_TREVENANT] = BACK_ANIM_V_SHAKE_LOW, - [SPECIES_PUMPKABOO] = BACK_ANIM_TRIANGLE_DOWN, - [SPECIES_GOURGEIST] = BACK_ANIM_V_STRETCH, + [SPECIES_PUMPKABOO_AVERAGE] = BACK_ANIM_TRIANGLE_DOWN, + [SPECIES_GOURGEIST_AVERAGE] = BACK_ANIM_V_STRETCH, [SPECIES_BERGMITE] = BACK_ANIM_H_SHAKE, [SPECIES_AVALUGG] = BACK_ANIM_V_SHAKE_LOW, [SPECIES_NOIBAT] = BACK_ANIM_TRIANGLE_DOWN, [SPECIES_NOIVERN] = BACK_ANIM_JOLT_RIGHT, - [SPECIES_XERNEAS] = BACK_ANIM_V_SHAKE_LOW, + [SPECIES_XERNEAS_NEUTRAL] = BACK_ANIM_V_SHAKE_LOW, [SPECIES_YVELTAL] = BACK_ANIM_SHAKE_GLOW_RED, - [SPECIES_ZYGARDE] = BACK_ANIM_V_STRETCH, + [SPECIES_ZYGARDE_50_AURA_BREAK] = BACK_ANIM_V_STRETCH, [SPECIES_DIANCIE] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, - [SPECIES_HOOPA] = BACK_ANIM_CONVEX_DOUBLE_ARC, + [SPECIES_HOOPA_CONFINED] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_VOLCANION] = BACK_ANIM_SHAKE_GLOW_RED, // Gen 7 todo: assign @@ -1251,7 +1251,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_GOURGEIST_LARGE] = BACK_ANIM_V_STRETCH, [SPECIES_GOURGEIST_SUPER] = BACK_ANIM_V_STRETCH, [SPECIES_XERNEAS_ACTIVE] = BACK_ANIM_SHAKE_GLOW_BLUE, - [SPECIES_ZYGARDE_10] = BACK_ANIM_JOLT_RIGHT, + [SPECIES_ZYGARDE_10_AURA_BREAK] = BACK_ANIM_JOLT_RIGHT, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = BACK_ANIM_SHAKE_GLOW_GREEN, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = BACK_ANIM_SHAKE_GLOW_GREEN, [SPECIES_ZYGARDE_COMPLETE] = BACK_ANIM_SHAKE_GLOW_GREEN, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index e6848ddbc5..2207ebfa1e 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -386,7 +386,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_ARON] = gMonIcon_Aron, [SPECIES_LAIRON] = gMonIcon_Lairon, [SPECIES_AGGRON] = gMonIcon_Aggron, - [SPECIES_CASTFORM] = gMonIcon_Castform, + [SPECIES_CASTFORM_NORMAL] = gMonIcon_CastformNormal, [SPECIES_VOLBEAT] = gMonIcon_Volbeat, [SPECIES_ILLUMISE] = gMonIcon_Illumise, [SPECIES_LILEEP] = gMonIcon_Lileep, @@ -411,7 +411,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_LATIAS] = gMonIcon_Latias, [SPECIES_LATIOS] = gMonIcon_Latios, [SPECIES_JIRACHI] = gMonIcon_Jirachi, - [SPECIES_DEOXYS] = gMonIcon_Deoxys, + [SPECIES_DEOXYS_NORMAL] = gMonIcon_DeoxysNormal, [SPECIES_CHIMECHO] = gMonIcon_Chimecho, #if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = gMonIcon_Turtwig, @@ -439,8 +439,8 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_RAMPARDOS] = gMonIcon_Rampardos, [SPECIES_SHIELDON] = gMonIcon_Shieldon, [SPECIES_BASTIODON] = gMonIcon_Bastiodon, - [SPECIES_BURMY] = gMonIcon_Burmy, - [SPECIES_WORMADAM] = gMonIcon_Wormadam, + [SPECIES_BURMY_PLANT_CLOAK] = gMonIcon_BurmyPlantCloak, + [SPECIES_WORMADAM_PLANT_CLOAK] = gMonIcon_WormadamPlantCloak, [SPECIES_MOTHIM] = gMonIcon_Mothim, [SPECIES_COMBEE] = gMonIcon_Combee, [SPECIES_VESPIQUEN] = gMonIcon_Vespiquen, @@ -448,9 +448,9 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_BUIZEL] = gMonIcon_Buizel, [SPECIES_FLOATZEL] = gMonIcon_Floatzel, [SPECIES_CHERUBI] = gMonIcon_Cherubi, - [SPECIES_CHERRIM] = gMonIcon_Cherrim, - [SPECIES_SHELLOS] = gMonIcon_Shellos, - [SPECIES_GASTRODON] = gMonIcon_Gastrodon, + [SPECIES_CHERRIM_OVERCAST] = gMonIcon_CherrimOvercast, + [SPECIES_SHELLOS_WEST_SEA] = gMonIcon_ShellosWestSea, + [SPECIES_GASTRODON_WEST_SEA] = gMonIcon_GastrodonWestSea, [SPECIES_AMBIPOM] = gMonIcon_Ambipom, [SPECIES_DRIFLOON] = gMonIcon_Drifloon, [SPECIES_DRIFBLIM] = gMonIcon_Drifblim, @@ -514,13 +514,13 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_PALKIA] = gMonIcon_Palkia, [SPECIES_HEATRAN] = gMonIcon_Heatran, [SPECIES_REGIGIGAS] = gMonIcon_Regigigas, - [SPECIES_GIRATINA] = gMonIcon_Giratina, + [SPECIES_GIRATINA_ALTERED] = gMonIcon_GiratinaAltered, [SPECIES_CRESSELIA] = gMonIcon_Cresselia, [SPECIES_PHIONE] = gMonIcon_Phione, [SPECIES_MANAPHY] = gMonIcon_Manaphy, [SPECIES_DARKRAI] = gMonIcon_Darkrai, - [SPECIES_SHAYMIN] = gMonIcon_Shaymin, - [SPECIES_ARCEUS] = gMonIcon_Arceus, + [SPECIES_SHAYMIN_LAND] = gMonIcon_ShayminLand, + [SPECIES_ARCEUS_NORMAL] = gMonIcon_Arceus, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = gMonIcon_Victini, @@ -579,12 +579,12 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_WHIMSICOTT] = gMonIcon_Whimsicott, [SPECIES_PETILIL] = gMonIcon_Petilil, [SPECIES_LILLIGANT] = gMonIcon_Lilligant, - [SPECIES_BASCULIN] = gMonIcon_Basculin, + [SPECIES_BASCULIN_RED_STRIPED] = gMonIcon_BasculinRedStriped, [SPECIES_SANDILE] = gMonIcon_Sandile, [SPECIES_KROKOROK] = gMonIcon_Krokorok, [SPECIES_KROOKODILE] = gMonIcon_Krookodile, [SPECIES_DARUMAKA] = gMonIcon_Darumaka, - [SPECIES_DARMANITAN] = gMonIcon_Darmanitan, + [SPECIES_DARMANITAN_STANDARD_MODE] = gMonIcon_DarmanitanStandardMode, [SPECIES_MARACTUS] = gMonIcon_Maractus, [SPECIES_DWEBBLE] = gMonIcon_Dwebble, [SPECIES_CRUSTLE] = gMonIcon_Crustle, @@ -614,8 +614,8 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_VANILLITE] = gMonIcon_Vanillite, [SPECIES_VANILLISH] = gMonIcon_Vanillish, [SPECIES_VANILLUXE] = gMonIcon_Vanilluxe, - [SPECIES_DEERLING] = gMonIcon_Deerling, - [SPECIES_SAWSBUCK] = gMonIcon_Sawsbuck, + [SPECIES_DEERLING_SPRING] = gMonIcon_DeerlingSpring, + [SPECIES_SAWSBUCK_SPRING] = gMonIcon_SawsbuckSpring, [SPECIES_EMOLGA] = gMonIcon_Emolga, [SPECIES_KARRABLAST] = gMonIcon_Karrablast, [SPECIES_ESCAVALIER] = gMonIcon_Escavalier, @@ -670,14 +670,14 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_COBALION] = gMonIcon_Cobalion, [SPECIES_TERRAKION] = gMonIcon_Terrakion, [SPECIES_VIRIZION] = gMonIcon_Virizion, - [SPECIES_TORNADUS] = gMonIcon_Tornadus, - [SPECIES_THUNDURUS] = gMonIcon_Thundurus, + [SPECIES_TORNADUS_INCARNATE] = gMonIcon_TornadusIncarnate, + [SPECIES_THUNDURUS_INCARNATE] = gMonIcon_ThundurusIncarnate, [SPECIES_RESHIRAM] = gMonIcon_Reshiram, [SPECIES_ZEKROM] = gMonIcon_Zekrom, - [SPECIES_LANDORUS] = gMonIcon_Landorus, + [SPECIES_LANDORUS_INCARNATE] = gMonIcon_LandorusIncarnate, [SPECIES_KYUREM] = gMonIcon_Kyurem, - [SPECIES_KELDEO] = gMonIcon_Keldeo, - [SPECIES_MELOETTA] = gMonIcon_Meloetta, + [SPECIES_KELDEO_ORDINARY] = gMonIcon_KeldeoOrdinary, + [SPECIES_MELOETTA_ARIA] = gMonIcon_MeloettaAria, [SPECIES_GENESECT] = gMonIcon_Genesect, #endif #if P_GEN_6_POKEMON == TRUE @@ -697,22 +697,22 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_TALONFLAME] = gMonIcon_Talonflame, [SPECIES_SCATTERBUG] = gMonIcon_Scatterbug, [SPECIES_SPEWPA] = gMonIcon_Spewpa, - [SPECIES_VIVILLON] = gMonIcon_Vivillon, + [SPECIES_VIVILLON_ICY_SNOW] = gMonIcon_VivillonIcySnow, [SPECIES_LITLEO] = gMonIcon_Litleo, [SPECIES_PYROAR] = gMonIcon_Pyroar, - [SPECIES_FLABEBE] = gMonIcon_Flabebe, - [SPECIES_FLOETTE] = gMonIcon_Floette, - [SPECIES_FLORGES] = gMonIcon_Florges, + [SPECIES_FLABEBE_RED_FLOWER] = gMonIcon_FlabebeRedFlower, + [SPECIES_FLOETTE_RED_FLOWER] = gMonIcon_FloetteRedFlower, + [SPECIES_FLORGES_RED_FLOWER] = gMonIcon_FlorgesRedFlower, [SPECIES_SKIDDO] = gMonIcon_Skiddo, [SPECIES_GOGOAT] = gMonIcon_Gogoat, [SPECIES_PANCHAM] = gMonIcon_Pancham, [SPECIES_PANGORO] = gMonIcon_Pangoro, - [SPECIES_FURFROU] = gMonIcon_Furfrou, + [SPECIES_FURFROU_NATURAL] = gMonIcon_FurfrouNatural, [SPECIES_ESPURR] = gMonIcon_Espurr, - [SPECIES_MEOWSTIC] = gMonIcon_Meowstic, + [SPECIES_MEOWSTIC_MALE] = gMonIcon_MeowsticMale, [SPECIES_HONEDGE] = gMonIcon_Honedge, [SPECIES_DOUBLADE] = gMonIcon_Doublade, - [SPECIES_AEGISLASH] = gMonIcon_Aegislash, + [SPECIES_AEGISLASH_SHIELD] = gMonIcon_AegislashShield, [SPECIES_SPRITZEE] = gMonIcon_Spritzee, [SPECIES_AROMATISSE] = gMonIcon_Aromatisse, [SPECIES_SWIRLIX] = gMonIcon_Swirlix, @@ -741,17 +741,17 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_KLEFKI] = gMonIcon_Klefki, [SPECIES_PHANTUMP] = gMonIcon_Phantump, [SPECIES_TREVENANT] = gMonIcon_Trevenant, - [SPECIES_PUMPKABOO] = gMonIcon_Pumpkaboo, - [SPECIES_GOURGEIST] = gMonIcon_Gourgeist, + [SPECIES_PUMPKABOO_AVERAGE] = gMonIcon_Pumpkaboo, + [SPECIES_GOURGEIST_AVERAGE] = gMonIcon_Gourgeist, [SPECIES_BERGMITE] = gMonIcon_Bergmite, [SPECIES_AVALUGG] = gMonIcon_Avalugg, [SPECIES_NOIBAT] = gMonIcon_Noibat, [SPECIES_NOIVERN] = gMonIcon_Noivern, - [SPECIES_XERNEAS] = gMonIcon_Xerneas, + [SPECIES_XERNEAS_NEUTRAL] = gMonIcon_XerneasNeutral, [SPECIES_YVELTAL] = gMonIcon_Yveltal, - [SPECIES_ZYGARDE] = gMonIcon_Zygarde, + [SPECIES_ZYGARDE_50_AURA_BREAK] = gMonIcon_Zygarde50, [SPECIES_DIANCIE] = gMonIcon_Diancie, - [SPECIES_HOOPA] = gMonIcon_Hoopa, + [SPECIES_HOOPA_CONFINED] = gMonIcon_HoopaConfined, [SPECIES_VOLCANION] = gMonIcon_Volcanion, #endif #if P_GEN_7_POKEMON == TRUE @@ -774,12 +774,12 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_VIKAVOLT] = gMonIcon_Vikavolt, [SPECIES_CRABRAWLER] = gMonIcon_Crabrawler, [SPECIES_CRABOMINABLE] = gMonIcon_Crabominable, - [SPECIES_ORICORIO] = gMonIcon_Oricorio, + [SPECIES_ORICORIO_BAILE] = gMonIcon_OricorioBaile, [SPECIES_CUTIEFLY] = gMonIcon_Cutiefly, [SPECIES_RIBOMBEE] = gMonIcon_Ribombee, [SPECIES_ROCKRUFF] = gMonIcon_Rockruff, - [SPECIES_LYCANROC] = gMonIcon_Lycanroc, - [SPECIES_WISHIWASHI] = gMonIcon_Wishiwashi, + [SPECIES_LYCANROC_MIDDAY] = gMonIcon_LycanrocMidday, + [SPECIES_WISHIWASHI_SOLO] = gMonIcon_WishiwashiSolo, [SPECIES_MAREANIE] = gMonIcon_Mareanie, [SPECIES_TOXAPEX] = gMonIcon_Toxapex, [SPECIES_MUDBRAY] = gMonIcon_Mudbray, @@ -806,12 +806,12 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_PALOSSAND] = gMonIcon_Palossand, [SPECIES_PYUKUMUKU] = gMonIcon_Pyukumuku, [SPECIES_TYPE_NULL] = gMonIcon_TypeNull, - [SPECIES_SILVALLY] = gMonIcon_Silvally, - [SPECIES_MINIOR] = gMonIcon_Minior, + [SPECIES_SILVALLY_NORMAL] = gMonIcon_Silvally, + [SPECIES_MINIOR_METEOR_RED] = gMonIcon_MiniorMeteor, [SPECIES_KOMALA] = gMonIcon_Komala, [SPECIES_TURTONATOR] = gMonIcon_Turtonator, [SPECIES_TOGEDEMARU] = gMonIcon_Togedemaru, - [SPECIES_MIMIKYU] = gMonIcon_Mimikyu, + [SPECIES_MIMIKYU_DISGUISED] = gMonIcon_MimikyuDisguised, [SPECIES_BRUXISH] = gMonIcon_Bruxish, [SPECIES_DRAMPA] = gMonIcon_Drampa, [SPECIES_DHELMISE] = gMonIcon_Dhelmise, @@ -884,13 +884,13 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_ARROKUDA] = gMonIcon_Arrokuda, [SPECIES_BARRASKEWDA] = gMonIcon_Barraskewda, [SPECIES_TOXEL] = gMonIcon_Toxel, - [SPECIES_TOXTRICITY] = gMonIcon_Toxtricity, + [SPECIES_TOXTRICITY_AMPED] = gMonIcon_ToxtricityAmped, [SPECIES_SIZZLIPEDE] = gMonIcon_Sizzlipede, [SPECIES_CENTISKORCH] = gMonIcon_Centiskorch, [SPECIES_CLOBBOPUS] = gMonIcon_Clobbopus, [SPECIES_GRAPPLOCT] = gMonIcon_Grapploct, - [SPECIES_SINISTEA] = gMonIcon_Sinistea, - [SPECIES_POLTEAGEIST] = gMonIcon_Polteageist, + [SPECIES_SINISTEA_PHONY] = gMonIcon_Sinistea, + [SPECIES_POLTEAGEIST_PHONY] = gMonIcon_Polteageist, [SPECIES_HATENNA] = gMonIcon_Hatenna, [SPECIES_HATTREM] = gMonIcon_Hattrem, [SPECIES_HATTERENE] = gMonIcon_Hatterene, @@ -904,15 +904,15 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_MR_RIME] = gMonIcon_MrRime, [SPECIES_RUNERIGUS] = gMonIcon_Runerigus, [SPECIES_MILCERY] = gMonIcon_Milcery, - [SPECIES_ALCREMIE] = gMonIcon_Alcremie, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = gMonIcon_Alcremie, [SPECIES_FALINKS] = gMonIcon_Falinks, [SPECIES_PINCURCHIN] = gMonIcon_Pincurchin, [SPECIES_SNOM] = gMonIcon_Snom, [SPECIES_FROSMOTH] = gMonIcon_Frosmoth, [SPECIES_STONJOURNER] = gMonIcon_Stonjourner, - [SPECIES_EISCUE] = gMonIcon_Eiscue, - [SPECIES_INDEEDEE] = gMonIcon_Indeedee, - [SPECIES_MORPEKO] = gMonIcon_Morpeko, + [SPECIES_EISCUE_ICE_FACE] = gMonIcon_EiscueIceFace, + [SPECIES_INDEEDEE_MALE] = gMonIcon_IndeedeeMale, + [SPECIES_MORPEKO_FULL_BELLY] = gMonIcon_MorpekoFullBelly, [SPECIES_CUFANT] = gMonIcon_Cufant, [SPECIES_COPPERAJAH] = gMonIcon_Copperajah, [SPECIES_DRACOZOLT] = gMonIcon_Dracozolt, @@ -923,11 +923,11 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_DREEPY] = gMonIcon_Dreepy, [SPECIES_DRAKLOAK] = gMonIcon_Drakloak, [SPECIES_DRAGAPULT] = gMonIcon_Dragapult, - [SPECIES_ZACIAN] = gMonIcon_Zacian, - [SPECIES_ZAMAZENTA] = gMonIcon_Zamazenta, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = gMonIcon_ZacianHeroOfManyBattles, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = gMonIcon_ZamazentaHeroOfManyBattles, [SPECIES_ETERNATUS] = gMonIcon_Eternatus, [SPECIES_KUBFU] = gMonIcon_Kubfu, - [SPECIES_URSHIFU] = gMonIcon_Urshifu, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = gMonIcon_UrshifuSingleStrikeStyle, [SPECIES_ZARUDE] = gMonIcon_Zarude, [SPECIES_REGIELEKI] = gMonIcon_Regieleki, [SPECIES_REGIDRAGO] = gMonIcon_Regidrago, @@ -937,10 +937,10 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_WYRDEER] = gMonIcon_Wyrdeer, [SPECIES_KLEAVOR] = gMonIcon_Kleavor, [SPECIES_URSALUNA] = gMonIcon_Ursaluna, - [SPECIES_BASCULEGION] = gMonIcon_Basculegion, + [SPECIES_BASCULEGION_MALE] = gMonIcon_BasculegionMale, [SPECIES_SNEASLER] = gMonIcon_Sneasler, [SPECIES_OVERQWIL] = gMonIcon_Overqwil, - [SPECIES_ENAMORUS] = gMonIcon_Enamorus, + [SPECIES_ENAMORUS_INCARNATE] = gMonIcon_EnamorusIncarnate, #endif [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, @@ -1033,7 +1033,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, #if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, - [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = gMonIcon_DarmanitanGalarianStandardMode, [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, #endif @@ -1146,7 +1146,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [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_DARMANITAN_GALARIAN_ZEN_MODE] = gMonIcon_DarmanitanGalarianZenMode, [SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer, [SPECIES_DEERLING_AUTUMN] = gMonIcon_DeerlingAutumn, [SPECIES_DEERLING_WINTER] = gMonIcon_DeerlingWinter, @@ -1218,9 +1218,9 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_GOURGEIST_LARGE] = gMonIcon_Gourgeist, [SPECIES_GOURGEIST_SUPER] = gMonIcon_Gourgeist, [SPECIES_XERNEAS_ACTIVE] = gMonIcon_XerneasActive, - [SPECIES_ZYGARDE_10] = gMonIcon_Zygarde10, + [SPECIES_ZYGARDE_10_AURA_BREAK] = gMonIcon_Zygarde10, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = gMonIcon_Zygarde10, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = gMonIcon_Zygarde, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = gMonIcon_Zygarde50, [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, #endif @@ -1249,12 +1249,12 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_SILVALLY_DRAGON] = gMonIcon_Silvally, [SPECIES_SILVALLY_DARK] = gMonIcon_Silvally, [SPECIES_SILVALLY_FAIRY] = gMonIcon_Silvally, - [SPECIES_MINIOR_METEOR_ORANGE] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_YELLOW] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_GREEN] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_BLUE] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_INDIGO] = gMonIcon_Minior, - [SPECIES_MINIOR_METEOR_VIOLET] = gMonIcon_Minior, + [SPECIES_MINIOR_METEOR_ORANGE] = gMonIcon_MiniorMeteor, + [SPECIES_MINIOR_METEOR_YELLOW] = gMonIcon_MiniorMeteor, + [SPECIES_MINIOR_METEOR_GREEN] = gMonIcon_MiniorMeteor, + [SPECIES_MINIOR_METEOR_BLUE] = gMonIcon_MiniorMeteor, + [SPECIES_MINIOR_METEOR_INDIGO] = gMonIcon_MiniorMeteor, + [SPECIES_MINIOR_METEOR_VIOLET] = gMonIcon_MiniorMeteor, [SPECIES_MINIOR_CORE_RED] = gMonIcon_MiniorCoreRed, [SPECIES_MINIOR_CORE_ORANGE] = gMonIcon_MiniorCoreOrange, [SPECIES_MINIOR_CORE_YELLOW] = gMonIcon_MiniorCoreYellow, @@ -1274,21 +1274,21 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, [SPECIES_SINISTEA_ANTIQUE] = gMonIcon_Sinistea, [SPECIES_POLTEAGEIST_ANTIQUE] = gMonIcon_Polteageist, - [SPECIES_ALCREMIE_RUBY_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubyCream, - [SPECIES_ALCREMIE_MATCHA_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMatchaCream, - [SPECIES_ALCREMIE_MINT_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMintCream, - [SPECIES_ALCREMIE_LEMON_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieLemonCream, - [SPECIES_ALCREMIE_SALTED_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieSaltedCream, - [SPECIES_ALCREMIE_RUBY_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubySwirl, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieCaramelSwirl, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRainbowSwirl, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieStrawberryRubyCream, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieStrawberryMatchaCream, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieStrawberryMintCream, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieStrawberryLemonCream, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieStrawberrySaltedCream, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieStrawberryRubySwirl, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieStrawberryCaramelSwirl, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieStrawberryRainbowSwirl, [SPECIES_EISCUE_NOICE_FACE] = gMonIcon_EiscueNoiceFace, [SPECIES_INDEEDEE_FEMALE] = gMonIcon_IndeedeeFemale, [SPECIES_MORPEKO_HANGRY] = gMonIcon_MorpekoHangry, [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_ZacianCrownedSword, [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_ZamazentaCrownedShield, [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_EternatusEternamax, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_Urshifu, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_UrshifuSingleStrikeStyle, [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada, [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider, [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider, @@ -1327,7 +1327,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_ALCREMIE_GIGANTAMAX] = gMonIcon_AlcremieGigantamax, [SPECIES_COPPERAJAH_GIGANTAMAX] = gMonIcon_CopperajahGigantamax, [SPECIES_DURALUDON_GIGANTAMAX] = gMonIcon_DuraludonGigantamax, - [SPECIES_URSHIFU_GIGANTAMAX] = gMonIcon_UrshifuGigantamax, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = gMonIcon_UrshifuSingleStrikeGigantamax, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = gMonIcon_UrshifuRapidStrikeGigantamax, #endif [SPECIES_EGG] = gMonIcon_Egg, @@ -1711,7 +1711,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ARON] = 2, [SPECIES_LAIRON] = 2, [SPECIES_AGGRON] = 2, - [SPECIES_CASTFORM] = 0, + [SPECIES_CASTFORM_NORMAL] = 0, [SPECIES_VOLBEAT] = 0, [SPECIES_ILLUMISE] = 2, [SPECIES_LILEEP] = 2, @@ -1736,7 +1736,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_LATIAS] = 0, [SPECIES_LATIOS] = 0, [SPECIES_JIRACHI] = 0, - [SPECIES_DEOXYS] = 0, + [SPECIES_DEOXYS_NORMAL] = 0, [SPECIES_CHIMECHO] = 0, [SPECIES_TURTWIG] = 1, [SPECIES_GROTLE] = 1, @@ -1763,8 +1763,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_RAMPARDOS] = 0, [SPECIES_SHIELDON] = 1, [SPECIES_BASTIODON] = 1, - [SPECIES_BURMY] = 1, - [SPECIES_WORMADAM] = 1, + [SPECIES_BURMY_PLANT_CLOAK] = 1, + [SPECIES_WORMADAM_PLANT_CLOAK] = 1, [SPECIES_MOTHIM] = 0, [SPECIES_COMBEE] = 0, [SPECIES_VESPIQUEN] = 0, @@ -1772,9 +1772,9 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BUIZEL] = 0, [SPECIES_FLOATZEL] = 0, [SPECIES_CHERUBI] = 1, - [SPECIES_CHERRIM] = 0, - [SPECIES_SHELLOS] = 0, - [SPECIES_GASTRODON] = 0, + [SPECIES_CHERRIM_OVERCAST] = 0, + [SPECIES_SHELLOS_WEST_SEA] = 0, + [SPECIES_GASTRODON_WEST_SEA] = 0, [SPECIES_AMBIPOM] = 2, [SPECIES_DRIFLOON] = 2, [SPECIES_DRIFBLIM] = 2, @@ -1838,13 +1838,13 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_PALKIA] = 2, [SPECIES_HEATRAN] = 0, [SPECIES_REGIGIGAS] = 0, - [SPECIES_GIRATINA] = 0, + [SPECIES_GIRATINA_ALTERED] = 0, [SPECIES_CRESSELIA] = 0, [SPECIES_PHIONE] = 0, [SPECIES_MANAPHY] = 0, [SPECIES_DARKRAI] = 0, - [SPECIES_SHAYMIN] = 1, - [SPECIES_ARCEUS] = 1, + [SPECIES_SHAYMIN_LAND] = 1, + [SPECIES_ARCEUS_NORMAL] = 1, [SPECIES_VICTINI] = 0, [SPECIES_SNIVY] = 1, [SPECIES_SERVINE] = 1, @@ -1901,12 +1901,12 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_WHIMSICOTT] = 1, [SPECIES_PETILIL] = 1, [SPECIES_LILLIGANT] = 1, - [SPECIES_BASCULIN] = 1, + [SPECIES_BASCULIN_RED_STRIPED] = 1, [SPECIES_SANDILE] = 1, [SPECIES_KROKOROK] = 1, [SPECIES_KROOKODILE] = 0, [SPECIES_DARUMAKA] = 0, - [SPECIES_DARMANITAN] = 0, + [SPECIES_DARMANITAN_STANDARD_MODE] = 0, [SPECIES_MARACTUS] = 1, [SPECIES_DWEBBLE] = 0, [SPECIES_CRUSTLE] = 2, @@ -1936,8 +1936,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_VANILLITE] = 0, [SPECIES_VANILLISH] = 2, [SPECIES_VANILLUXE] = 2, - [SPECIES_DEERLING] = 1, - [SPECIES_SAWSBUCK] = 1, + [SPECIES_DEERLING_SPRING] = 1, + [SPECIES_SAWSBUCK_SPRING] = 1, [SPECIES_EMOLGA] = 2, [SPECIES_KARRABLAST] = 0, [SPECIES_ESCAVALIER] = 0, @@ -1992,14 +1992,14 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_COBALION] = 0, [SPECIES_TERRAKION] = 2, [SPECIES_VIRIZION] = 1, - [SPECIES_TORNADUS] = 1, - [SPECIES_THUNDURUS] = 0, + [SPECIES_TORNADUS_INCARNATE] = 1, + [SPECIES_THUNDURUS_INCARNATE] = 0, [SPECIES_RESHIRAM] = 0, [SPECIES_ZEKROM] = 2, - [SPECIES_LANDORUS] = 0, + [SPECIES_LANDORUS_INCARNATE] = 0, [SPECIES_KYUREM] = 0, - [SPECIES_KELDEO] = 0, - [SPECIES_MELOETTA] = 4, + [SPECIES_KELDEO_ORDINARY] = 0, + [SPECIES_MELOETTA_ARIA] = 4, [SPECIES_GENESECT] = 2, [SPECIES_CHESPIN] = 1, [SPECIES_QUILLADIN] = 1, @@ -2017,22 +2017,22 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_TALONFLAME] = 2, [SPECIES_SCATTERBUG] = 1, [SPECIES_SPEWPA] = 1, - [SPECIES_VIVILLON] = 0, + [SPECIES_VIVILLON_ICY_SNOW] = 0, [SPECIES_LITLEO] = 2, [SPECIES_PYROAR] = 2, - [SPECIES_FLABEBE] = 1, - [SPECIES_FLOETTE] = 1, - [SPECIES_FLORGES] = 0, + [SPECIES_FLABEBE_RED_FLOWER] = 1, + [SPECIES_FLOETTE_RED_FLOWER] = 1, + [SPECIES_FLORGES_RED_FLOWER] = 0, [SPECIES_SKIDDO] = 1, [SPECIES_GOGOAT] = 1, [SPECIES_PANCHAM] = 1, [SPECIES_PANGORO] = 1, - [SPECIES_FURFROU] = 0, + [SPECIES_FURFROU_NATURAL] = 0, [SPECIES_ESPURR] = 2, - [SPECIES_MEOWSTIC] = 0, + [SPECIES_MEOWSTIC_MALE] = 0, [SPECIES_HONEDGE] = 2, [SPECIES_DOUBLADE] = 2, - [SPECIES_AEGISLASH] = 2, + [SPECIES_AEGISLASH_SHIELD] = 2, [SPECIES_SPRITZEE] = 0, [SPECIES_AROMATISSE] = 0, [SPECIES_SWIRLIX] = 1, @@ -2061,17 +2061,17 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_KLEFKI] = 0, [SPECIES_PHANTUMP] = 1, [SPECIES_TREVENANT] = 1, - [SPECIES_PUMPKABOO] = 2, - [SPECIES_GOURGEIST] = 2, + [SPECIES_PUMPKABOO_AVERAGE] = 2, + [SPECIES_GOURGEIST_AVERAGE] = 2, [SPECIES_BERGMITE] = 0, [SPECIES_AVALUGG] = 0, [SPECIES_NOIBAT] = 2, [SPECIES_NOIVERN] = 2, - [SPECIES_XERNEAS] = 0, + [SPECIES_XERNEAS_NEUTRAL] = 0, [SPECIES_YVELTAL] = 0, - [SPECIES_ZYGARDE] = 1, + [SPECIES_ZYGARDE_50_AURA_BREAK] = 1, [SPECIES_DIANCIE] = 1, - [SPECIES_HOOPA] = 0, + [SPECIES_HOOPA_CONFINED] = 0, [SPECIES_VOLCANION] = 0, [SPECIES_ROWLET] = 0, [SPECIES_DARTRIX] = 1, @@ -2092,12 +2092,12 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_VIKAVOLT] = 0, [SPECIES_CRABRAWLER] = 2, [SPECIES_CRABOMINABLE] = 2, - [SPECIES_ORICORIO] = 0, + [SPECIES_ORICORIO_BAILE] = 0, [SPECIES_CUTIEFLY] = 2, [SPECIES_RIBOMBEE] = 2, [SPECIES_ROCKRUFF] = 2, - [SPECIES_LYCANROC] = 2, - [SPECIES_WISHIWASHI] = 2, + [SPECIES_LYCANROC_MIDDAY] = 2, + [SPECIES_WISHIWASHI_SOLO] = 2, [SPECIES_MAREANIE] = 2, [SPECIES_TOXAPEX] = 0, [SPECIES_MUDBRAY] = 2, @@ -2124,12 +2124,12 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_PALOSSAND] = 2, [SPECIES_PYUKUMUKU] = 0, [SPECIES_TYPE_NULL] = 0, - [SPECIES_SILVALLY] = 0, - [SPECIES_MINIOR] = 2, + [SPECIES_SILVALLY_NORMAL] = 0, + [SPECIES_MINIOR_METEOR_RED] = 2, [SPECIES_KOMALA] = 2, [SPECIES_TURTONATOR] = 0, [SPECIES_TOGEDEMARU] = 2, - [SPECIES_MIMIKYU] = 1, + [SPECIES_MIMIKYU_DISGUISED] = 1, [SPECIES_BRUXISH] = 0, [SPECIES_DRAMPA] = 0, [SPECIES_DHELMISE] = 1, @@ -2200,13 +2200,13 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ARROKUDA] = 2, [SPECIES_BARRASKEWDA] = 2, [SPECIES_TOXEL] = 2, - [SPECIES_TOXTRICITY] = 2, + [SPECIES_TOXTRICITY_AMPED] = 2, [SPECIES_SIZZLIPEDE] = 0, [SPECIES_CENTISKORCH] = 0, [SPECIES_CLOBBOPUS] = 0, [SPECIES_GRAPPLOCT] = 2, - [SPECIES_SINISTEA] = 2, - [SPECIES_POLTEAGEIST] = 2, + [SPECIES_SINISTEA_PHONY] = 2, + [SPECIES_POLTEAGEIST_PHONY] = 2, [SPECIES_HATENNA] = 0, [SPECIES_HATTREM] = 0, [SPECIES_HATTERENE] = 0, @@ -2220,15 +2220,15 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MR_RIME] = 0, [SPECIES_RUNERIGUS] = 2, [SPECIES_MILCERY] = 1, - [SPECIES_ALCREMIE] = 1, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = 1, [SPECIES_FALINKS] = 0, [SPECIES_PINCURCHIN] = 0, [SPECIES_SNOM] = 0, [SPECIES_FROSMOTH] = 0, [SPECIES_STONJOURNER] = 2, - [SPECIES_EISCUE] = 0, - [SPECIES_INDEEDEE] = 2, - [SPECIES_MORPEKO] = 2, + [SPECIES_EISCUE_ICE_FACE] = 0, + [SPECIES_INDEEDEE_MALE] = 2, + [SPECIES_MORPEKO_FULL_BELLY] = 2, [SPECIES_CUFANT] = 0, [SPECIES_COPPERAJAH] = 0, [SPECIES_DRACOZOLT] = 1, @@ -2239,11 +2239,11 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DREEPY] = 0, [SPECIES_DRAKLOAK] = 0, [SPECIES_DRAGAPULT] = 0, - [SPECIES_ZACIAN] = 2, - [SPECIES_ZAMAZENTA] = 2, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = 2, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = 2, [SPECIES_ETERNATUS] = 0, [SPECIES_KUBFU] = 1, - [SPECIES_URSHIFU] = 2, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = 2, [SPECIES_ZARUDE] = 1, [SPECIES_REGIELEKI] = 0, [SPECIES_REGIDRAGO] = 0, @@ -2253,10 +2253,10 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_WYRDEER] = 2, [SPECIES_KLEAVOR] = 2, [SPECIES_URSALUNA] = 2, - [SPECIES_BASCULEGION] = 1, + [SPECIES_BASCULEGION_MALE] = 1, [SPECIES_SNEASLER] = 2, [SPECIES_OVERQWIL] = 2, - [SPECIES_ENAMORUS] = 1, + [SPECIES_ENAMORUS_INCARNATE] = 1, [SPECIES_VENUSAUR_MEGA] = 4, [SPECIES_CHARIZARD_MEGA_X] = 0, [SPECIES_CHARIZARD_MEGA_Y] = 0, @@ -2341,7 +2341,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZIGZAGOON_GALARIAN] = 0, [SPECIES_LINOONE_GALARIAN] = 0, [SPECIES_DARUMAKA_GALARIAN] = 0, - [SPECIES_DARMANITAN_GALARIAN] = 0, + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = 0, [SPECIES_YAMASK_GALARIAN] = 2, [SPECIES_STUNFISK_GALARIAN] = 1, [SPECIES_GROWLITHE_HISUIAN] = 0, @@ -2421,7 +2421,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BASCULIN_BLUE_STRIPED] = 0, [SPECIES_BASCULIN_WHITE_STRIPED] = 0, [SPECIES_DARMANITAN_ZEN_MODE] = 0, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = 0, + [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = 0, [SPECIES_DEERLING_SUMMER] = 1, [SPECIES_DEERLING_AUTUMN] = 0, [SPECIES_DEERLING_WINTER] = 2, @@ -2493,7 +2493,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_GOURGEIST_LARGE] = 2, [SPECIES_GOURGEIST_SUPER] = 2, [SPECIES_XERNEAS_ACTIVE] = 0, - [SPECIES_ZYGARDE_10] = 1, + [SPECIES_ZYGARDE_10_AURA_BREAK] = 1, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = 1, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = 1, [SPECIES_ZYGARDE_COMPLETE] = 1, @@ -2543,14 +2543,14 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_TOXTRICITY_LOW_KEY] = 2, [SPECIES_SINISTEA_ANTIQUE] = 2, [SPECIES_POLTEAGEIST_ANTIQUE] = 2, - [SPECIES_ALCREMIE_RUBY_CREAM] = 0, - [SPECIES_ALCREMIE_MATCHA_CREAM] = 0, - [SPECIES_ALCREMIE_MINT_CREAM] = 0, - [SPECIES_ALCREMIE_LEMON_CREAM] = 0, - [SPECIES_ALCREMIE_SALTED_CREAM] = 0, - [SPECIES_ALCREMIE_RUBY_SWIRL] = 0, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = 0, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = 0, + [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = 0, [SPECIES_EISCUE_NOICE_FACE] = 0, [SPECIES_INDEEDEE_FEMALE] = 2, [SPECIES_MORPEKO_HANGRY] = 2, @@ -2595,7 +2595,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ALCREMIE_GIGANTAMAX] = 1, [SPECIES_COPPERAJAH_GIGANTAMAX] = 0, [SPECIES_DURALUDON_GIGANTAMAX] = 0, - [SPECIES_URSHIFU_GIGANTAMAX] = 0, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = 0, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = 0, #endif [SPECIES_EGG] = 1, diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 9478084d9b..bbbffba4b3 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -426,288 +426,288 @@ EWRAM_DATA static struct PokemonJumpGfx *sPokemonJumpGfx = NULL; */ static const struct PokemonJumpMons sPokeJumpMons[] = { - { .species = SPECIES_BULBASAUR, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CHARMANDER, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SQUIRTLE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_CATERPIE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_METAPOD, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_WEEDLE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_KAKUNA, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_RATTATA, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_RATTATA_ALOLAN, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_RATICATE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_RATICATE_ALOLAN, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PIKACHU, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_COSPLAY, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_ROCK_STAR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_BELLE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_POP_STAR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_PH_D, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_LIBRE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_ORIGINAL_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_HOENN_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_SINNOH_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_UNOVA_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_KALOS_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_ALOLA_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_PARTNER_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_WORLD_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SANDSHREW, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SANDSHREW_ALOLAN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_NIDORAN_F, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_NIDORAN_M, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_CLEFAIRY, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_VULPIX, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_VULPIX_ALOLAN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_JIGGLYPUFF, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ODDISH, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_PARAS, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_MEOWTH, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MEOWTH_ALOLAN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MEOWTH_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PSYDUCK, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MANKEY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_GROWLITHE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_POLIWAG, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_BELLSPROUT, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SHELLDER, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_KRABBY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_EXEGGCUTE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CUBONE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_DITTO, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_EEVEE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_OMANYTE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_KABUTO, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_CHIKORITA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CYNDAQUIL, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_TOTODILE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SPINARAK, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PICHU, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PICHU_SPIKY_EARED, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_CLEFFA, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_IGGLYBUFF, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_TOGEPI, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MAREEP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_BELLOSSOM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MARILL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SUNKERN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_WOOPER, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_PINECO, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SNUBBULL, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SHUCKLE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_TEDDIURSA, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SLUGMA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SWINUB, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_HOUNDOUR, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PHANPY, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PORYGON2, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_TYROGUE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SMOOCHUM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ELEKID, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_MAGBY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_LARVITAR, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_TREECKO, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_TORCHIC, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MUDKIP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MARSHTOMP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_POOCHYENA, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_ZIGZAGOON, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ZIGZAGOON_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_LINOONE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_LINOONE_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_WURMPLE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SILCOON, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CASCOON, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_LOTAD, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SEEDOT, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_RALTS, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_KIRLIA, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SURSKIT, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SHROOMISH, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_NINCADA, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_WHISMUR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_AZURILL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SKITTY, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SABLEYE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SABLEYE_MEGA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MAWILE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ARON, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_MEDITITE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ELECTRIKE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PLUSLE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_MINUN, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_VOLBEAT, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ILLUMISE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ROSELIA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_GULPIN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_NUMEL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_TORKOAL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SPOINK, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_TRAPINCH, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CACNEA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ANORITH, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_WYNAUT, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SNORUNT, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_CLAMPERL, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_BAGON, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_TURTWIG, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CHIMCHAR, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PIPLUP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_BIDOOF, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_KRICKETOT, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SHINX, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_BUDEW, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SHIELDON, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_PACHIRISU, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_BUIZEL, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_CHERUBI, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_CHERRIM, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_CHERRIM_SUNSHINE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SHELLOS, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SHELLOS_EAST_SEA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_BUNEARY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_GLAMEOW, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_STUNKY, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_BONSLY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_MIME_JR, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_HAPPINY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_GIBLE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MUNCHLAX, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_RIOLU, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_CROAGUNK, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SHAYMIN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SNIVY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_TEPIG, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_OSHAWOTT, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PATRAT, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_LILLIPUP, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PURRLOIN, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PANSAGE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PANSEAR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PANPOUR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ROGGENROLA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_DRILBUR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_EXCADRILL, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_TIMBURR, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SEWADDLE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SWADLOON, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_VENIPEDE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PETILIL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SANDILE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_DARUMAKA, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_DARUMAKA_GALARIAN, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_DWEBBLE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SCRAGGY, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ARCHEN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_TRUBBISH, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ZORUA, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_MINCCINO, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_CINCCINO, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_GOTHITA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_GOTHORITA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_DEERLING, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_DEERLING_SUMMER, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_DEERLING_AUTUMN, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_DEERLING_WINTER, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_KARRABLAST, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_FOONGUS, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_AMOONGUSS, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_JOLTIK, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_LITWICK, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_AXEW, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_CUBCHOO, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SHELMET, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_STUNFISK, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_STUNFISK_GALARIAN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_PAWNIARD, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_DURANT, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_CHESPIN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_QUILLADIN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_FENNEKIN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_FROAKIE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_FROGADIER, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_BUNNELBY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SCATTERBUG, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SPEWPA, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_LITLEO, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PANCHAM, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_ESPURR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MEOWSTIC, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MEOWSTIC_FEMALE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_BINACLE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CLAUNCHER, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_HELIOPTILE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_DEDENNE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_GOOMY, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ROWLET, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_DARTRIX, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_LITTEN, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_TORRACAT, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_POPPLIO, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_BRIONNE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_YUNGOOS, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_GUMSHOOS, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_GRUBBIN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CHARJABUG, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_CRABRAWLER, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ROCKRUFF, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ROCKRUFF_OWN_TEMPO, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MAREANIE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_DEWPIDER, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_FOMANTIS, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MORELULL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SALANDIT, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_STUFFUL, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_BOUNSWEET, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_STEENEE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_WIMPOD, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_PYUKUMUKU, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_KOMALA, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_TOGEDEMARU, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MIMIKYU, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MIMIKYU_BUSTED, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_JANGMO_O, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_MARSHADOW, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MELTAN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_GROOKEY, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_THWACKEY, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SCORBUNNY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_RABOOT, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SOBBLE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_DRIZZILE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SKWOVET, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SKWOVET, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_BLIPBUG, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_DOTTLER, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_NICKIT, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_GOSSIFLEUR, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ELDEGOSS, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_WOOLOO, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_CHEWTLE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_YAMPER, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ROLYCOLY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_APPLIN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_APPLETUN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_TOXEL, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SIZZLIPEDE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_CLOBBOPUS, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_HATENNA, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_HATTREM, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_IMPIDIMP, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_ALCREMIE, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ALCREMIE_RUBY_CREAM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ALCREMIE_MATCHA_CREAM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ALCREMIE_MINT_CREAM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ALCREMIE_LEMON_CREAM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ALCREMIE_SALTED_CREAM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ALCREMIE_RUBY_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ALCREMIE_CARAMEL_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_ALCREMIE_RAINBOW_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_PINCURCHIN, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SNOM, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_MORPEKO, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MORPEKO_HANGRY, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_KUBFU, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_BULBASAUR, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CHARMANDER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SQUIRTLE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_CATERPIE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_METAPOD, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_WEEDLE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_KAKUNA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RATTATA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RATTATA_ALOLAN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RATICATE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RATICATE_ALOLAN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PIKACHU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_COSPLAY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_ROCK_STAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_BELLE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_POP_STAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_PH_D, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_LIBRE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_ORIGINAL_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_HOENN_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_SINNOH_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_UNOVA_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_KALOS_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_ALOLA_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_PARTNER_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_WORLD_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SANDSHREW, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SANDSHREW_ALOLAN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_NIDORAN_F, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_NIDORAN_M, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_CLEFAIRY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_VULPIX, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_VULPIX_ALOLAN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_JIGGLYPUFF, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ODDISH, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_PARAS, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MEOWTH, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWTH_ALOLAN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWTH_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PSYDUCK, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MANKEY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GROWLITHE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_POLIWAG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_BELLSPROUT, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SHELLDER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_KRABBY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_EXEGGCUTE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CUBONE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_DITTO, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_EEVEE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_OMANYTE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_KABUTO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CHIKORITA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CYNDAQUIL, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TOTODILE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPINARAK, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PICHU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PICHU_SPIKY_EARED, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_CLEFFA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_IGGLYBUFF, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_TOGEPI, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MAREEP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BELLOSSOM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MARILL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SUNKERN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_WOOPER, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_PINECO, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SNUBBULL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SHUCKLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_TEDDIURSA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SLUGMA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SWINUB, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_HOUNDOUR, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PHANPY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PORYGON2, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_TYROGUE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SMOOCHUM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ELEKID, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MAGBY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_LARVITAR, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TREECKO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TORCHIC, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MUDKIP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MARSHTOMP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_POOCHYENA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_ZIGZAGOON, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ZIGZAGOON_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_LINOONE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_LINOONE_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_WURMPLE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SILCOON, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CASCOON, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_LOTAD, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SEEDOT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RALTS, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_KIRLIA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SURSKIT, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SHROOMISH, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_NINCADA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_WHISMUR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_AZURILL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SKITTY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SABLEYE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SABLEYE_MEGA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MAWILE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ARON, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MEDITITE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ELECTRIKE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PLUSLE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MINUN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_VOLBEAT, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ILLUMISE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ROSELIA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_GULPIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_NUMEL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_TORKOAL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SPOINK, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_TRAPINCH, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CACNEA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ANORITH, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_WYNAUT, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SNORUNT, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_CLAMPERL, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_BAGON, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TURTWIG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CHIMCHAR, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PIPLUP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BIDOOF, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_KRICKETOT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SHINX, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BUDEW, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SHIELDON, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_PACHIRISU, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_BUIZEL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_CHERUBI, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CHERRIM_OVERCAST, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CHERRIM_SUNSHINE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SHELLOS_WEST_SEA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SHELLOS_EAST_SEA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_BUNEARY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GLAMEOW, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_STUNKY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BONSLY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MIME_JR, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_HAPPINY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GIBLE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MUNCHLAX, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_RIOLU, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CROAGUNK, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SHAYMIN_LAND, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SNIVY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TEPIG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_OSHAWOTT, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PATRAT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_LILLIPUP, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PURRLOIN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PANSAGE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PANSEAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PANPOUR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ROGGENROLA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DRILBUR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_EXCADRILL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_TIMBURR, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SEWADDLE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SWADLOON, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_VENIPEDE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PETILIL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SANDILE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_DARUMAKA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DARUMAKA_GALARIAN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DWEBBLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SCRAGGY, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ARCHEN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_TRUBBISH, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ZORUA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MINCCINO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CINCCINO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_GOTHITA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_GOTHORITA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DEERLING_SPRING, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DEERLING_SUMMER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DEERLING_AUTUMN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DEERLING_WINTER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_KARRABLAST, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_FOONGUS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_AMOONGUSS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_JOLTIK, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_LITWICK, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_AXEW, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CUBCHOO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SHELMET, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_STUNFISK, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_STUNFISK_GALARIAN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_PAWNIARD, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DURANT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CHESPIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_QUILLADIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_FENNEKIN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_FROAKIE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_FROGADIER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_BUNNELBY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SPEWPA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_LITLEO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PANCHAM, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_ESPURR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWSTIC_MALE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWSTIC_FEMALE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BINACLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CLAUNCHER, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_HELIOPTILE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_DEDENNE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GOOMY, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ROWLET, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_DARTRIX, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_LITTEN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TORRACAT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_POPPLIO, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_BRIONNE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_YUNGOOS, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GUMSHOOS, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_GRUBBIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CHARJABUG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CRABRAWLER, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ROCKRUFF, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ROCKRUFF_OWN_TEMPO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MAREANIE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DEWPIDER, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_FOMANTIS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MORELULL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SALANDIT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_STUFFUL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BOUNSWEET, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_STEENEE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_WIMPOD, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PYUKUMUKU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_KOMALA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_TOGEDEMARU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MIMIKYU_DISGUISED, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MIMIKYU_BUSTED, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_JANGMO_O, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MARSHADOW, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MELTAN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_GROOKEY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_THWACKEY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SCORBUNNY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RABOOT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SOBBLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DRIZZILE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SKWOVET, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SKWOVET, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_BLIPBUG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DOTTLER, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_NICKIT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GOSSIFLEUR, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ELDEGOSS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_WOOLOO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_CHEWTLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_YAMPER, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ROLYCOLY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_APPLIN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_APPLETUN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_TOXEL, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SIZZLIPEDE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CLOBBOPUS, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_HATENNA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_HATTREM, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_IMPIDIMP, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_PINCURCHIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SNOM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MORPEKO_FULL_BELLY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MORPEKO_HANGRY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_KUBFU, .jumpType = JUMP_TYPE_FAST, }, }; void StartPokemonJump(u16 partyId, MainCallback exitCallback) diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index bfe2e7581a..ee3cc559f8 100644 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -71,7 +71,7 @@ u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 u heldItem[1] = item >> 8; SetMonData(&mon, MON_DATA_HELD_ITEM, heldItem); - // In case a mon with a form changing item is given. Eg: SPECIES_ARCEUS with ITEM_SPLASH_PLATE will transform into SPECIES_ARCEUS_WATER upon gifted. + // In case a mon with a form changing item is given. Eg: SPECIES_ARCEUS_NORMAL with ITEM_SPLASH_PLATE will transform into SPECIES_ARCEUS_WATER upon gifted. targetSpecies = GetFormChangeTargetSpecies(&mon, FORM_CHANGE_ITEM_HOLD, 0); if (targetSpecies != SPECIES_NONE) { diff --git a/src/trade.c b/src/trade.c index 95538ab40b..4976e00912 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1570,13 +1570,6 @@ static u8 CheckValidityOfTradeMons(u8 *aliveMons, u8 playerPartyCount, u8 player partnerMonIdx %= PARTY_SIZE; partnerSpecies = GetMonData(&gEnemyParty[partnerMonIdx], MON_DATA_SPECIES); - // Partner cant trade illegitimate Deoxys or Mew - if (partnerSpecies == SPECIES_DEOXYS || partnerSpecies == SPECIES_MEW) - { - if (!GetMonData(&gEnemyParty[partnerMonIdx], MON_DATA_MODERN_FATEFUL_ENCOUNTER)) - return PARTNER_MON_INVALID; - } - // Can't trade specific species if (gSpeciesInfo[partnerSpecies].flags & SPECIES_FLAG_CANNOT_BE_TRADED) return PARTNER_MON_INVALID; @@ -2424,12 +2417,6 @@ static u32 CanTradeSelectedMon(struct Pokemon *playerParty, int partyCount, int } } - if (species[monIdx] == SPECIES_DEOXYS || species[monIdx] == SPECIES_MEW) - { - if (!GetMonData(&playerParty[monIdx], MON_DATA_MODERN_FATEFUL_ENCOUNTER)) - return CANT_TRADE_INVALID_MON; - } - // Can't trade specific species if (gSpeciesInfo[species[monIdx]].flags & SPECIES_FLAG_CANNOT_BE_TRADED) return CANT_TRADE_INVALID_MON; @@ -2495,16 +2482,6 @@ s32 GetGameProgressForLinkTrade(void) return TRADE_BOTH_PLAYERS_READY; } -static bool32 IsDeoxysOrMewUntradable(u16 species, bool8 isModernFatefulEncounter) -{ - if (species == SPECIES_DEOXYS || species == SPECIES_MEW) - { - if (!isModernFatefulEncounter) - return TRUE; - } - return FALSE; -} - int GetUnionRoomTradeMessageId(struct RfuGameCompatibilityData player, struct RfuGameCompatibilityData partner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, bool8 isModernFatefulEncounter) { bool8 playerHasNationalDex = player.hasNationalDex; @@ -2523,10 +2500,6 @@ int GetUnionRoomTradeMessageId(struct RfuGameCompatibilityData player, struct Rf return UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_2; } - // Cannot trade illegitimate Deoxys/Mew - if (IsDeoxysOrMewUntradable(playerSpecies, isModernFatefulEncounter)) - return UR_TRADE_MSG_MON_CANT_BE_TRADED; - // Can't trade specific species if (gSpeciesInfo[playerSpecies].flags & SPECIES_FLAG_CANNOT_BE_TRADED) return UR_TRADE_MSG_MON_CANT_BE_TRADED; @@ -2575,9 +2548,6 @@ int CanRegisterMonForTradingBoard(struct RfuGameCompatibilityData player, u16 sp { bool8 hasNationalDex = player.hasNationalDex; - if (IsDeoxysOrMewUntradable(species, isModernFatefulEncounter)) - return CANT_REGISTER_MON_NOW; - // Can't trade specific species if (gSpeciesInfo[species].flags & SPECIES_FLAG_CANNOT_BE_TRADED) return CANT_REGISTER_MON; diff --git a/test/battle/ability/flower_gift.c b/test/battle/ability/flower_gift.c index e02f90dc6c..a956741e5e 100644 --- a/test/battle/ability/flower_gift.c +++ b/test/battle/ability/flower_gift.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Flower Gift transforms Cherrim in harsh sunlight") { GIVEN { - PLAYER(SPECIES_CHERRIM) { Ability(ABILITY_FLOWER_GIFT); } + PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SUNNY_DAY); } @@ -20,7 +20,7 @@ SINGLE_BATTLE_TEST("Flower Gift transforms Cherrim in harsh sunlight") SINGLE_BATTLE_TEST("Flower Gift transforms Cherrim back to normal when weather changes") { GIVEN { - PLAYER(SPECIES_CHERRIM) { Ability(ABILITY_FLOWER_GIFT); } + PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SUNNY_DAY); } @@ -35,7 +35,7 @@ SINGLE_BATTLE_TEST("Flower Gift transforms Cherrim back to normal when weather c ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); MESSAGE("Cherrim transformed!"); } THEN { - EXPECT_EQ(player->species, SPECIES_CHERRIM); + EXPECT_EQ(player->species, SPECIES_CHERRIM_OVERCAST); } } @@ -43,7 +43,7 @@ SINGLE_BATTLE_TEST("Flower Gift transforms Cherrim back to normal when its abili { GIVEN { ASSUME(B_WEATHER_FORMS >= GEN_5); - PLAYER(SPECIES_CHERRIM) { Ability(ABILITY_FLOWER_GIFT); } + PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SUNNY_DAY); } @@ -57,7 +57,7 @@ SINGLE_BATTLE_TEST("Flower Gift transforms Cherrim back to normal when its abili ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); MESSAGE("Cherrim transformed!"); } THEN { - EXPECT_EQ(player->species, SPECIES_CHERRIM); + EXPECT_EQ(player->species, SPECIES_CHERRIM_OVERCAST); } } @@ -67,7 +67,7 @@ DOUBLE_BATTLE_TEST("Flower Gift increases the attack of Cherrim and its allies b PARAMETRIZE { sunny = FALSE; } PARAMETRIZE { sunny = TRUE; } GIVEN { - PLAYER(SPECIES_CHERRIM) { Ability(ABILITY_FLOWER_GIFT); } + PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -101,7 +101,7 @@ DOUBLE_BATTLE_TEST("Flower Gift increases the Sp. Def of Cherrim and its allies PARAMETRIZE { sunny = FALSE; } PARAMETRIZE { sunny = TRUE; } GIVEN { - PLAYER(SPECIES_CHERRIM) { Ability(ABILITY_FLOWER_GIFT); } + PLAYER(SPECIES_CHERRIM_OVERCAST) { Ability(ABILITY_FLOWER_GIFT); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/forecast.c b/test/battle/ability/forecast.c index 66793ebfb2..6bb4c5045f 100644 --- a/test/battle/ability/forecast.c +++ b/test/battle/ability/forecast.c @@ -9,7 +9,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform in weather from an opponent's m PARAMETRIZE { move = MOVE_HAIL; } PARAMETRIZE { move = MOVE_SNOWSCAPE; } GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, move); } @@ -42,7 +42,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform in weather from its own move") PARAMETRIZE { move = MOVE_HAIL; } PARAMETRIZE { move = MOVE_SNOWSCAPE; } GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, move); } @@ -75,7 +75,7 @@ DOUBLE_BATTLE_TEST("Forecast transforms Castform in weather from a partner's mov PARAMETRIZE { move = MOVE_HAIL; } PARAMETRIZE { move = MOVE_SNOWSCAPE; } GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -110,10 +110,10 @@ DOUBLE_BATTLE_TEST("Forecast transforms all Castforms present in weather") PARAMETRIZE { move = MOVE_HAIL; } PARAMETRIZE { move = MOVE_SNOWSCAPE; } GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } - OPPONENT(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } - OPPONENT(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } + OPPONENT(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } + OPPONENT(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } } WHEN { TURN { MOVE(playerRight, move); } } SCENE { @@ -162,7 +162,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform in weather from an ability") PARAMETRIZE { species = SPECIES_GROUDON; ability = ABILITY_DROUGHT; } PARAMETRIZE { species = SPECIES_ABOMASNOW; ability = ABILITY_SNOW_WARNING; } GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(species) { Ability(ability); } } WHEN { @@ -193,7 +193,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform in primal weather") PARAMETRIZE { species = SPECIES_KYOGRE; ability = ABILITY_PRIMORDIAL_SEA; item = ITEM_BLUE_ORB; } PARAMETRIZE { species = SPECIES_GROUDON; ability = ABILITY_DESOLATE_LAND; item = ITEM_RED_ORB; } GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(species) { Item(item); } } WHEN { @@ -219,7 +219,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform in primal weather") SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal when weather expires") { GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_RAIN_DANCE); } @@ -238,14 +238,14 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal when weather exp ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); MESSAGE("Castform transformed!"); } THEN { - EXPECT_EQ(player->species, SPECIES_CASTFORM); + EXPECT_EQ(player->species, SPECIES_CASTFORM_NORMAL); } } SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal when Sandstorm is active") { GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_RAIN_DANCE); } @@ -260,7 +260,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal when Sandstorm i ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); MESSAGE("Castform transformed!"); } THEN { - EXPECT_EQ(player->species, SPECIES_CASTFORM); + EXPECT_EQ(player->species, SPECIES_CASTFORM_NORMAL); } } @@ -268,7 +268,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal under Air Lock") { KNOWN_FAILING; GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_RAYQUAZA); } WHEN { @@ -285,7 +285,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal under Air Lock") ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); MESSAGE("Castform transformed!"); } THEN { - EXPECT_EQ(player->species, SPECIES_CASTFORM); + EXPECT_EQ(player->species, SPECIES_CASTFORM_NORMAL); } } @@ -293,7 +293,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform on switch-in") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_RAIN_DANCE); } @@ -313,7 +313,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform on switch-in") SINGLE_BATTLE_TEST("Forecast transforms Castform when weather changes") { GIVEN { - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_RAIN_DANCE); } @@ -336,7 +336,7 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal when its ability { GIVEN { ASSUME(B_WEATHER_FORMS >= GEN_5); - PLAYER(SPECIES_CASTFORM) { Ability(ABILITY_FORECAST); } + PLAYER(SPECIES_CASTFORM_NORMAL) { Ability(ABILITY_FORECAST); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SUNNY_DAY); } @@ -350,6 +350,6 @@ SINGLE_BATTLE_TEST("Forecast transforms Castform back to normal when its ability ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); MESSAGE("Castform transformed!"); } THEN { - EXPECT_EQ(player->species, SPECIES_CASTFORM); + EXPECT_EQ(player->species, SPECIES_CASTFORM_NORMAL); } } diff --git a/test/battle/ability/hunger_switch.c b/test/battle/ability/hunger_switch.c index c0802d6643..2b39bde589 100644 --- a/test/battle/ability/hunger_switch.c +++ b/test/battle/ability/hunger_switch.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Hunger Switch switches Morpeko's forms at the end of the turn") { u16 species; - PARAMETRIZE { species = SPECIES_MORPEKO; } + PARAMETRIZE { species = SPECIES_MORPEKO_FULL_BELLY; } PARAMETRIZE { species = SPECIES_MORPEKO_HANGRY; } GIVEN { ASSUME(P_GEN_8_POKEMON == TRUE); @@ -17,9 +17,9 @@ SINGLE_BATTLE_TEST("Hunger Switch switches Morpeko's forms at the end of the tur MESSAGE("Foe Wobbuffet used Celebrate!"); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); } THEN { - if (species == SPECIES_MORPEKO) + if (species == SPECIES_MORPEKO_FULL_BELLY) EXPECT_EQ(player->species, SPECIES_MORPEKO_HANGRY); else - EXPECT_EQ(player->species, SPECIES_MORPEKO); + EXPECT_EQ(player->species, SPECIES_MORPEKO_FULL_BELLY); } } diff --git a/test/battle/ability/schooling.c b/test/battle/ability/schooling.c index 448e37261d..49a70266de 100644 --- a/test/battle/ability/schooling.c +++ b/test/battle/ability/schooling.c @@ -9,8 +9,8 @@ SINGLE_BATTLE_TEST("Schooling switches Level 20+ Wishiwashi's form when HP is 25 GIVEN { ASSUME(P_GEN_7_POKEMON == TRUE); - ASSUME(gSpeciesInfo[SPECIES_WISHIWASHI].baseHP == gSpeciesInfo[SPECIES_WISHIWASHI_SCHOOL].baseHP); - PLAYER(SPECIES_WISHIWASHI) + ASSUME(gSpeciesInfo[SPECIES_WISHIWASHI_SOLO].baseHP == gSpeciesInfo[SPECIES_WISHIWASHI_SCHOOL].baseHP); + PLAYER(SPECIES_WISHIWASHI_SOLO) { Level(level); HP(GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP) / 2); @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Schooling switches Level 20+ Wishiwashi's form when HP is 25 ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); } } THEN { - EXPECT_EQ(player->species, SPECIES_WISHIWASHI); + EXPECT_EQ(player->species, SPECIES_WISHIWASHI_SOLO); } } @@ -49,8 +49,8 @@ SINGLE_BATTLE_TEST("Schooling switches Level 20+ Wishiwashi's form when HP is ov GIVEN { ASSUME(P_GEN_7_POKEMON == TRUE); - ASSUME(gSpeciesInfo[SPECIES_WISHIWASHI].baseHP == gSpeciesInfo[SPECIES_WISHIWASHI_SCHOOL].baseHP); - PLAYER(SPECIES_WISHIWASHI) + ASSUME(gSpeciesInfo[SPECIES_WISHIWASHI_SOLO].baseHP == gSpeciesInfo[SPECIES_WISHIWASHI_SCHOOL].baseHP); + PLAYER(SPECIES_WISHIWASHI_SOLO) { Level(level); HP(GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP) / (overQuarterHP ? 2 : 4)); @@ -71,7 +71,7 @@ SINGLE_BATTLE_TEST("Schooling switches Level 20+ Wishiwashi's form when HP is ov if (level >= 20 && overQuarterHP) EXPECT_EQ(player->species, SPECIES_WISHIWASHI_SCHOOL); else - EXPECT_EQ(player->species, SPECIES_WISHIWASHI); + EXPECT_EQ(player->species, SPECIES_WISHIWASHI_SOLO); } } @@ -83,8 +83,8 @@ SINGLE_BATTLE_TEST("Schooling switches Level 20+ Wishiwashi's form when HP is he GIVEN { ASSUME(P_GEN_7_POKEMON == TRUE); - ASSUME(gSpeciesInfo[SPECIES_WISHIWASHI].baseHP == gSpeciesInfo[SPECIES_WISHIWASHI_SCHOOL].baseHP); - PLAYER(SPECIES_WISHIWASHI) + ASSUME(gSpeciesInfo[SPECIES_WISHIWASHI_SOLO].baseHP == gSpeciesInfo[SPECIES_WISHIWASHI_SCHOOL].baseHP); + PLAYER(SPECIES_WISHIWASHI_SOLO) { Level(level); HP(GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP) / 4); @@ -106,6 +106,6 @@ SINGLE_BATTLE_TEST("Schooling switches Level 20+ Wishiwashi's form when HP is he if (level >= 20) EXPECT_EQ(player->species, SPECIES_WISHIWASHI_SCHOOL); else - EXPECT_EQ(player->species, SPECIES_WISHIWASHI); + EXPECT_EQ(player->species, SPECIES_WISHIWASHI_SOLO); } } diff --git a/test/battle/ability/zen_mode.c b/test/battle/ability/zen_mode.c index 37bb4160f9..3d1e25ffa7 100644 --- a/test/battle/ability/zen_mode.c +++ b/test/battle/ability/zen_mode.c @@ -4,8 +4,8 @@ SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is half or less at the end of the turn") { u16 standardSpecies, zenSpecies; - PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; } - PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE_GALARIAN; } + PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; } + PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_GALARIAN_ZEN_MODE; } GIVEN { ASSUME(P_GEN_5_POKEMON == TRUE); @@ -34,8 +34,8 @@ SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is half or less SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is half or less before the first turn") { u16 standardSpecies, zenSpecies; - PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; } - PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE_GALARIAN; } + PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; } + PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_GALARIAN_ZEN_MODE; } GIVEN { ASSUME(P_GEN_5_POKEMON == TRUE); @@ -63,8 +63,8 @@ SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is half or less SINGLE_BATTLE_TEST("Zen Mode switches Darmanitan's form when HP is healed above half") { u16 standardSpecies, zenSpecies; - PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; } - PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE_GALARIAN; } + PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_ZEN_MODE; } + PARAMETRIZE { standardSpecies = SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE; zenSpecies = SPECIES_DARMANITAN_GALARIAN_ZEN_MODE; } GIVEN { ASSUME(P_GEN_5_POKEMON == TRUE); diff --git a/test/battle/form_change/battle_switch.c b/test/battle/form_change/battle_switch.c index bd18e0ccfc..dd6c68466e 100644 --- a/test/battle/form_change/battle_switch.c +++ b/test/battle/form_change/battle_switch.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon switching out") { GIVEN { ASSUME(P_GEN_6_POKEMON == TRUE); - PLAYER(SPECIES_AEGISLASH); + PLAYER(SPECIES_AEGISLASH_SHIELD); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -18,6 +18,6 @@ SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon switching out") MESSAGE("Aegislash used Tackle!"); MESSAGE("Foe Wobbuffet used Celebrate!"); } THEN { - EXPECT_EQ(player->species, SPECIES_AEGISLASH); + EXPECT_EQ(player->species, SPECIES_AEGISLASH_SHIELD); } } diff --git a/test/battle/form_change/begin_battle.c b/test/battle/form_change/begin_battle.c index 328db756df..b61ff069d4 100644 --- a/test/battle/form_change/begin_battle.c +++ b/test/battle/form_change/begin_battle.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Xerneas changes into Active Form upon battle start") { GIVEN { ASSUME(P_GEN_6_POKEMON == TRUE); - PLAYER(SPECIES_XERNEAS); + PLAYER(SPECIES_XERNEAS_NEUTRAL); OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CELEBRATE); } @@ -21,13 +21,13 @@ SINGLE_BATTLE_TEST("Zacian changes into its Crowned Form when holding the Rusted PARAMETRIZE { item = ITEM_RUSTED_SWORD; } GIVEN { ASSUME(P_GEN_8_POKEMON == TRUE); - PLAYER(SPECIES_ZACIAN) { Item(item); } + PLAYER(SPECIES_ZACIAN_HERO_OF_MANY_BATTLES) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CELEBRATE); } } THEN { if (item == ITEM_NONE) - EXPECT_EQ(player->species, SPECIES_ZACIAN); + EXPECT_EQ(player->species, SPECIES_ZACIAN_HERO_OF_MANY_BATTLES); else EXPECT_EQ(player->species, SPECIES_ZACIAN_CROWNED_SWORD); } @@ -37,7 +37,7 @@ SINGLE_BATTLE_TEST("Zacian's Iron Head becomes Behemoth Blade upon form change") { GIVEN { ASSUME(P_GEN_8_POKEMON == TRUE); - PLAYER(SPECIES_ZACIAN) { Item(ITEM_RUSTED_SWORD); Moves(MOVE_IRON_HEAD, MOVE_CELEBRATE); } + PLAYER(SPECIES_ZACIAN_HERO_OF_MANY_BATTLES) { Item(ITEM_RUSTED_SWORD); Moves(MOVE_IRON_HEAD, MOVE_CELEBRATE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CELEBRATE); } @@ -54,13 +54,13 @@ SINGLE_BATTLE_TEST("Zamazenta changes into its Crowned Form when holding the Rus PARAMETRIZE { item = ITEM_RUSTED_SHIELD; } GIVEN { ASSUME(P_GEN_8_POKEMON == TRUE); - PLAYER(SPECIES_ZAMAZENTA) { Item(item); } + PLAYER(SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CELEBRATE); } } THEN { if (item == ITEM_NONE) - EXPECT_EQ(player->species, SPECIES_ZAMAZENTA); + EXPECT_EQ(player->species, SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES); else EXPECT_EQ(player->species, SPECIES_ZAMAZENTA_CROWNED_SHIELD); } @@ -70,7 +70,7 @@ SINGLE_BATTLE_TEST("Zamazenta's Iron Head becomes Behemoth Bash upon form change { GIVEN { ASSUME(P_GEN_8_POKEMON == TRUE); - PLAYER(SPECIES_ZAMAZENTA) { Item(ITEM_RUSTED_SHIELD); Moves(MOVE_IRON_HEAD, MOVE_CELEBRATE); } + PLAYER(SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES) { Item(ITEM_RUSTED_SHIELD); Moves(MOVE_IRON_HEAD, MOVE_CELEBRATE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CELEBRATE); } diff --git a/test/battle/form_change/faint.c b/test/battle/form_change/faint.c index f4baa2894e..82f361917e 100644 --- a/test/battle/form_change/faint.c +++ b/test/battle/form_change/faint.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon fainting") { GIVEN { ASSUME(P_GEN_6_POKEMON == TRUE); - PLAYER(SPECIES_AEGISLASH) { HP(1); } + PLAYER(SPECIES_AEGISLASH_SHIELD) { HP(1); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -14,6 +14,6 @@ SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon fainting") MESSAGE("Foe Wobbuffet used Gust!"); MESSAGE("Aegislash fainted!"); } THEN { - EXPECT_EQ(GetMonData(&PLAYER_PARTY[0], MON_DATA_SPECIES), SPECIES_AEGISLASH); + EXPECT_EQ(GetMonData(&PLAYER_PARTY[0], MON_DATA_SPECIES), SPECIES_AEGISLASH_SHIELD); } }