From dbd02d1857baa8249c3b60a180beac51a0f8d8df Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Tue, 10 Nov 2020 20:05:01 -0300 Subject: [PATCH] Fixed defines. --- src/data/pokemon/egg_moves.h | 14 +- src/data/pokemon_graphics/back_pic_table.h | 138 ++--- src/data/pokemon_graphics/front_pic_anims.h | 546 +++++++++--------- src/data/pokemon_graphics/front_pic_table.h | 138 ++--- src/data/pokemon_graphics/palette_table.h | 138 ++--- .../pokemon_graphics/shiny_palette_table.h | 138 ++--- 6 files changed, 556 insertions(+), 556 deletions(-) diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 0ae0da670f..a4784c1914 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -4034,7 +4034,7 @@ const u16 gEggMoves[] = { MOVE_REVERSAL, MOVE_DRAGON_BREATH), - egg_moves(ALOLAN_RATTATA, + egg_moves(RATTATA_ALOLAN, MOVE_COUNTER, MOVE_FINAL_GAMBIT, MOVE_FURY_SWIPES, @@ -4047,7 +4047,7 @@ const u16 gEggMoves[] = { MOVE_SWITCHEROO, MOVE_UPROAR), - egg_moves(ALOLAN_SANDSHREW, + egg_moves(SANDSHREW_ALOLAN, MOVE_AMNESIA, MOVE_CHIP_AWAY, MOVE_COUNTER, @@ -4061,7 +4061,7 @@ const u16 gEggMoves[] = { MOVE_METAL_CLAW, MOVE_NIGHT_SLASH), - egg_moves(ALOLAN_VULPIX, + egg_moves(VULPIX_ALOLAN, MOVE_AGILITY, MOVE_CHARM, MOVE_DISABLE, @@ -4077,7 +4077,7 @@ const u16 gEggMoves[] = { MOVE_SECRET_POWER, MOVE_TAIL_SLAP), - egg_moves(ALOLAN_DIGLETT, + egg_moves(DIGLETT_ALOLAN, MOVE_ANCIENT_POWER, MOVE_BEAT_UP, MOVE_ENDURE, @@ -4090,7 +4090,7 @@ const u16 gEggMoves[] = { MOVE_REVERSAL, MOVE_THRASH), - egg_moves(ALOLAN_MEOWTH, + egg_moves(MEOWTH_ALOLAN, MOVE_AMNESIA, MOVE_ASSIST, MOVE_CHARM, @@ -4104,7 +4104,7 @@ const u16 gEggMoves[] = { MOVE_SNATCH, MOVE_SPITE), - egg_moves(ALOLAN_GEODUDE, + egg_moves(GEODUDE_ALOLAN, MOVE_AUTOTOMIZE, MOVE_BLOCK, MOVE_COUNTER, @@ -4116,7 +4116,7 @@ const u16 gEggMoves[] = { MOVE_SCREECH, MOVE_WIDE_GUARD), - egg_moves(ALOLAN_GRIMER, + egg_moves(GRIMER_ALOLAN, MOVE_ASSURANCE, MOVE_CLEAR_SMOG, MOVE_CURSE, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index a871d4078e..e2d7e13f0c 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -811,76 +811,76 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(MELTAN, gMonBackPic_Meltan), SPECIES_SPRITE(MELMETAL, gMonBackPic_Melmetal), - SPECIES_SPRITE(MEGA_VENUSAUR, gMonBackPic_MegaVenusaur), - SPECIES_SPRITE(MEGA_CHARIZARD_X, gMonBackPic_MegaCharizardX), - SPECIES_SPRITE(MEGA_CHARIZARD_Y, gMonBackPic_MegaCharizardY), - SPECIES_SPRITE(MEGA_BLASTOISE, gMonBackPic_MegaBlastoise), - SPECIES_SPRITE(MEGA_BEEDRILL, gMonBackPic_MegaBeedrill), - SPECIES_SPRITE(MEGA_PIDGEOT, gMonBackPic_MegaPidgeot), - SPECIES_SPRITE(MEGA_ALAKAZAM, gMonBackPic_MegaAlakazam), - SPECIES_SPRITE(MEGA_SLOWBRO, gMonBackPic_MegaSlowbro), - SPECIES_SPRITE(MEGA_GENGAR, gMonBackPic_MegaGengar), - SPECIES_SPRITE(MEGA_KANGASKHAN, gMonBackPic_MegaKangaskhan), - SPECIES_SPRITE(MEGA_PINSIR, gMonBackPic_MegaPinsir), - SPECIES_SPRITE(MEGA_GYARADOS, gMonBackPic_MegaGyarados), - SPECIES_SPRITE(MEGA_AERODACTYL, gMonBackPic_MegaAerodactyl), - SPECIES_SPRITE(MEGA_MEWTWO_X, gMonBackPic_MegaMewtwoX), - SPECIES_SPRITE(MEGA_MEWTWO_Y, gMonBackPic_MegaMewtwoY), - SPECIES_SPRITE(MEGA_AMPHAROS, gMonBackPic_MegaAmpharos), - SPECIES_SPRITE(MEGA_STEELIX, gMonBackPic_MegaSteelix), - SPECIES_SPRITE(MEGA_SCIZOR, gMonBackPic_MegaScizor), - SPECIES_SPRITE(MEGA_HERACROSS, gMonBackPic_MegaHeracross), - SPECIES_SPRITE(MEGA_HOUNDOOM, gMonBackPic_MegaHoundoom), - SPECIES_SPRITE(MEGA_TYRANITAR, gMonBackPic_MegaTyranitar), - SPECIES_SPRITE(MEGA_SCEPTILE, gMonBackPic_MegaSceptile), - SPECIES_SPRITE(MEGA_BLAZIKEN, gMonBackPic_MegaBlaziken), - SPECIES_SPRITE(MEGA_SWAMPERT, gMonBackPic_MegaSwampert), - SPECIES_SPRITE(MEGA_GARDEVOIR, gMonBackPic_MegaGardevoir), - SPECIES_SPRITE(MEGA_SABLEYE, gMonBackPic_MegaSableye), - SPECIES_SPRITE(MEGA_MAWILE, gMonBackPic_MegaMawile), - SPECIES_SPRITE(MEGA_AGGRON, gMonBackPic_MegaAggron), - SPECIES_SPRITE(MEGA_MEDICHAM, gMonBackPic_MegaMedicham), - SPECIES_SPRITE(MEGA_MANECTRIC, gMonBackPic_MegaManectric), - SPECIES_SPRITE(MEGA_SHARPEDO, gMonBackPic_MegaSharpedo), - SPECIES_SPRITE(MEGA_CAMERUPT, gMonBackPic_MegaCamerupt), - SPECIES_SPRITE(MEGA_ALTARIA, gMonBackPic_MegaAltaria), - SPECIES_SPRITE(MEGA_BANETTE, gMonBackPic_MegaBanette), - SPECIES_SPRITE(MEGA_ABSOL, gMonBackPic_MegaAbsol), - SPECIES_SPRITE(MEGA_GLALIE, gMonBackPic_MegaGlalie), - SPECIES_SPRITE(MEGA_SALAMENCE, gMonBackPic_MegaSalamence), - SPECIES_SPRITE(MEGA_METAGROSS, gMonBackPic_MegaMetagross), - SPECIES_SPRITE(MEGA_LATIAS, gMonBackPic_MegaLatias), - SPECIES_SPRITE(MEGA_LATIOS, gMonBackPic_MegaLatios), - SPECIES_SPRITE(MEGA_LOPUNNY, gMonBackPic_MegaLopunny), - SPECIES_SPRITE(MEGA_GARCHOMP, gMonBackPic_MegaGarchomp), - SPECIES_SPRITE(MEGA_LUCARIO, gMonBackPic_MegaLucario), - SPECIES_SPRITE(MEGA_ABOMASNOW, gMonBackPic_MegaAbomasnow), - SPECIES_SPRITE(MEGA_GALLADE, gMonBackPic_MegaGallade), - SPECIES_SPRITE(MEGA_AUDINO, gMonBackPic_MegaAudino), - SPECIES_SPRITE(MEGA_DIANCIE, gMonBackPic_MegaDiancie), + SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_MegaVenusaur), + SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonBackPic_MegaCharizardX), + SPECIES_SPRITE(CHARIZARD_MEGA_Y, gMonBackPic_MegaCharizardY), + SPECIES_SPRITE(BLASTOISE_MEGA, gMonBackPic_MegaBlastoise), + SPECIES_SPRITE(BEEDRILL_MEGA, gMonBackPic_MegaBeedrill), + SPECIES_SPRITE(PIDGEOT_MEGA, gMonBackPic_MegaPidgeot), + SPECIES_SPRITE(ALAKAZAM_MEGA, gMonBackPic_MegaAlakazam), + SPECIES_SPRITE(SLOWBRO_MEGA, gMonBackPic_MegaSlowbro), + SPECIES_SPRITE(GENGAR_MEGA, gMonBackPic_MegaGengar), + SPECIES_SPRITE(KANGASKHAN_MEGA, gMonBackPic_MegaKangaskhan), + SPECIES_SPRITE(PINSIR_MEGA, gMonBackPic_MegaPinsir), + SPECIES_SPRITE(GYARADOS_MEGA, gMonBackPic_MegaGyarados), + SPECIES_SPRITE(AERODACTYL_MEGA, gMonBackPic_MegaAerodactyl), + SPECIES_SPRITE(MEWTWO_MEGA_X, gMonBackPic_MegaMewtwoX), + SPECIES_SPRITE(MEWTWO_MEGA_Y, gMonBackPic_MegaMewtwoY), + SPECIES_SPRITE(AMPHAROS_MEGA, gMonBackPic_MegaAmpharos), + SPECIES_SPRITE(STEELIX_MEGA, gMonBackPic_MegaSteelix), + SPECIES_SPRITE(SCIZOR_MEGA, gMonBackPic_MegaScizor), + SPECIES_SPRITE(HERACROSS_MEGA, gMonBackPic_MegaHeracross), + SPECIES_SPRITE(HOUNDOOM_MEGA, gMonBackPic_MegaHoundoom), + SPECIES_SPRITE(TYRANITAR_MEGA, gMonBackPic_MegaTyranitar), + SPECIES_SPRITE(SCEPTILE_MEGA, gMonBackPic_MegaSceptile), + SPECIES_SPRITE(BLAZIKEN_MEGA, gMonBackPic_MegaBlaziken), + SPECIES_SPRITE(SWAMPERT_MEGA, gMonBackPic_MegaSwampert), + SPECIES_SPRITE(GARDEVOIR_MEGA, gMonBackPic_MegaGardevoir), + SPECIES_SPRITE(SABLEYE_MEGA, gMonBackPic_MegaSableye), + SPECIES_SPRITE(MAWILE_MEGA, gMonBackPic_MegaMawile), + SPECIES_SPRITE(AGGRON_MEGA, gMonBackPic_MegaAggron), + SPECIES_SPRITE(MEDICHAM_MEGA, gMonBackPic_MegaMedicham), + SPECIES_SPRITE(MANECTRIC_MEGA, gMonBackPic_MegaManectric), + SPECIES_SPRITE(SHARPEDO_MEGA, gMonBackPic_MegaSharpedo), + SPECIES_SPRITE(CAMERUPT_MEGA, gMonBackPic_MegaCamerupt), + SPECIES_SPRITE(ALTARIA_MEGA, gMonBackPic_MegaAltaria), + SPECIES_SPRITE(BANETTE_MEGA, gMonBackPic_MegaBanette), + SPECIES_SPRITE(ABSOL_MEGA, gMonBackPic_MegaAbsol), + SPECIES_SPRITE(GLALIE_MEGA, gMonBackPic_MegaGlalie), + SPECIES_SPRITE(SALAMENCE_MEGA, gMonBackPic_MegaSalamence), + SPECIES_SPRITE(METAGROSS_MEGA, gMonBackPic_MegaMetagross), + SPECIES_SPRITE(LATIAS_MEGA, gMonBackPic_MegaLatias), + SPECIES_SPRITE(LATIOS_MEGA, gMonBackPic_MegaLatios), + SPECIES_SPRITE(LOPUNNY_MEGA, gMonBackPic_MegaLopunny), + SPECIES_SPRITE(GARCHOMP_MEGA, gMonBackPic_MegaGarchomp), + SPECIES_SPRITE(LUCARIO_MEGA, gMonBackPic_MegaLucario), + SPECIES_SPRITE(ABOMASNOW_MEGA, gMonBackPic_MegaAbomasnow), + SPECIES_SPRITE(GALLADE_MEGA, gMonBackPic_MegaGallade), + SPECIES_SPRITE(AUDINO_MEGA, gMonBackPic_MegaAudino), + SPECIES_SPRITE(DIANCIE_MEGA, gMonBackPic_MegaDiancie), - SPECIES_SPRITE(MEGA_RAYQUAZA, gMonBackPic_MegaRayquaza), - SPECIES_SPRITE(PRIMAL_KYOGRE, gMonBackPic_PrimalKyogre), - SPECIES_SPRITE(PRIMAL_GROUDON, gMonBackPic_PrimalGroudon), + SPECIES_SPRITE(RAYQUAZA_MEGA, gMonBackPic_MegaRayquaza), + SPECIES_SPRITE(KYOGRE_PRIMAL, gMonBackPic_PrimalKyogre), + SPECIES_SPRITE(GROUDON_PRIMAL, gMonBackPic_PrimalGroudon), - SPECIES_SPRITE(ALOLAN_RATTATA, gMonBackPic_AlolanRattata), - SPECIES_SPRITE(ALOLAN_RATICATE, gMonBackPic_AlolanRaticate), - SPECIES_SPRITE(ALOLAN_RAICHU, gMonBackPic_AlolanRaichu), - SPECIES_SPRITE(ALOLAN_SANDSHREW, gMonBackPic_AlolanSandshrew), - SPECIES_SPRITE(ALOLAN_SANDSLASH, gMonBackPic_AlolanSandslash), - SPECIES_SPRITE(ALOLAN_VULPIX, gMonBackPic_AlolanVulpix), - SPECIES_SPRITE(ALOLAN_NINETALES, gMonBackPic_AlolanNinetales), - SPECIES_SPRITE(ALOLAN_DIGLETT, gMonBackPic_AlolanDiglett), - SPECIES_SPRITE(ALOLAN_DUGTRIO, gMonBackPic_AlolanDugtrio), - SPECIES_SPRITE(ALOLAN_MEOWTH, gMonBackPic_AlolanMeowth), - SPECIES_SPRITE(ALOLAN_PERSIAN, gMonBackPic_AlolanPersian), - SPECIES_SPRITE(ALOLAN_GEODUDE, gMonBackPic_AlolanGeodude), - SPECIES_SPRITE(ALOLAN_GRAVELER, gMonBackPic_AlolanGraveler), - SPECIES_SPRITE(ALOLAN_GOLEM, gMonBackPic_AlolanGolem), - SPECIES_SPRITE(ALOLAN_GRIMER, gMonBackPic_AlolanGrimer), - SPECIES_SPRITE(ALOLAN_MUK, gMonBackPic_AlolanMuk), - SPECIES_SPRITE(ALOLAN_EXEGGUTOR, gMonBackPic_AlolanExeggutor), - SPECIES_SPRITE(ALOLAN_MAROWAK, gMonBackPic_AlolanMarowak), + SPECIES_SPRITE(RATTATA_ALOLAN, gMonBackPic_AlolanRattata), + SPECIES_SPRITE(RATICATE_ALOLAN, gMonBackPic_AlolanRaticate), + SPECIES_SPRITE(RAICHU_ALOLAN, gMonBackPic_AlolanRaichu), + SPECIES_SPRITE(SANDSHREW_ALOLAN, gMonBackPic_AlolanSandshrew), + SPECIES_SPRITE(SANDSLASH_ALOLAN, gMonBackPic_AlolanSandslash), + SPECIES_SPRITE(VULPIX_ALOLAN, gMonBackPic_AlolanVulpix), + SPECIES_SPRITE(NINETALES_ALOLAN, gMonBackPic_AlolanNinetales), + SPECIES_SPRITE(DIGLETT_ALOLAN, gMonBackPic_AlolanDiglett), + SPECIES_SPRITE(DUGTRIO_ALOLAN, gMonBackPic_AlolanDugtrio), + SPECIES_SPRITE(MEOWTH_ALOLAN, gMonBackPic_AlolanMeowth), + SPECIES_SPRITE(PERSIAN_ALOLAN, gMonBackPic_AlolanPersian), + SPECIES_SPRITE(GEODUDE_ALOLAN, gMonBackPic_AlolanGeodude), + SPECIES_SPRITE(GRAVELER_ALOLAN, gMonBackPic_AlolanGraveler), + SPECIES_SPRITE(GOLEM_ALOLAN, gMonBackPic_AlolanGolem), + SPECIES_SPRITE(GRIMER_ALOLAN, gMonBackPic_AlolanGrimer), + SPECIES_SPRITE(MUK_ALOLAN, gMonBackPic_AlolanMuk), + SPECIES_SPRITE(EXEGGUTOR_ALOLAN, gMonBackPic_AlolanExeggutor), + SPECIES_SPRITE(MAROWAK_ALOLAN, gMonBackPic_AlolanMarowak), SPECIES_SPRITE(PIKACHU_COSPLAY, gMonBackPic_PikachuCosplay), SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonBackPic_PikachuRockStar), @@ -1052,7 +1052,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(FURFROU_KABUKI_TRIM, gMonBackPic_FurfrouKabukiTrim), SPECIES_SPRITE(FURFROU_PHARAOH_TRIM, gMonBackPic_FurfrouPharaohTrim), - SPECIES_SPRITE(MEOWSTIC_F, gMonBackPic_MeowsticFemale), + SPECIES_SPRITE(MEOWSTIC_FEMALE, gMonBackPic_MeowsticFemale), SPECIES_SPRITE(AEGISLASH_BLADE, gMonBackPic_AegislashBlade), diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index fbcd977a85..a069535065 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -7900,409 +7900,409 @@ static const union AnimCmd sAnim_MELMETAL_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_VENUSAUR_1[] = +static const union AnimCmd sAnim_VENUSAUR_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_CHARIZARD_X_1[] = +static const union AnimCmd sAnim_CHARIZARD_MEGA_X_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_CHARIZARD_Y_1[] = +static const union AnimCmd sAnim_CHARIZARD_MEGA_Y_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_BLASTOISE_1[] = +static const union AnimCmd sAnim_BLASTOISE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_BEEDRILL_1[] = +static const union AnimCmd sAnim_BEEDRILL_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_PIDGEOT_1[] = +static const union AnimCmd sAnim_PIDGEOT_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_ALAKAZAM_1[] = +static const union AnimCmd sAnim_ALAKAZAM_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_SLOWBRO_1[] = +static const union AnimCmd sAnim_SLOWBRO_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_GENGAR_1[] = +static const union AnimCmd sAnim_GENGAR_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_KANGASKHAN_1[] = +static const union AnimCmd sAnim_KANGASKHAN_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_PINSIR_1[] = +static const union AnimCmd sAnim_PINSIR_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_GYARADOS_1[] = +static const union AnimCmd sAnim_GYARADOS_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_AERODACTYL_1[] = +static const union AnimCmd sAnim_AERODACTYL_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_MEWTWO_X_1[] = +static const union AnimCmd sAnim_MEWTWO_MEGA_X_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_MEWTWO_Y_1[] = +static const union AnimCmd sAnim_MEWTWO_MEGA_Y_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_AMPHAROS_1[] = +static const union AnimCmd sAnim_AMPHAROS_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_STEELIX_1[] = +static const union AnimCmd sAnim_STEELIX_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_SCIZOR_1[] = +static const union AnimCmd sAnim_SCIZOR_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_HERACROSS_1[] = +static const union AnimCmd sAnim_HERACROSS_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_HOUNDOOM_1[] = +static const union AnimCmd sAnim_HOUNDOOM_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_TYRANITAR_1[] = +static const union AnimCmd sAnim_TYRANITAR_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_SCEPTILE_1[] = +static const union AnimCmd sAnim_SCEPTILE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_BLAZIKEN_1[] = +static const union AnimCmd sAnim_BLAZIKEN_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_SWAMPERT_1[] = +static const union AnimCmd sAnim_SWAMPERT_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_GARDEVOIR_1[] = +static const union AnimCmd sAnim_GARDEVOIR_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_SABLEYE_1[] = +static const union AnimCmd sAnim_SABLEYE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_MAWILE_1[] = +static const union AnimCmd sAnim_MAWILE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_AGGRON_1[] = +static const union AnimCmd sAnim_AGGRON_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_MEDICHAM_1[] = +static const union AnimCmd sAnim_MEDICHAM_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_MANECTRIC_1[] = +static const union AnimCmd sAnim_MANECTRIC_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_SHARPEDO_1[] = +static const union AnimCmd sAnim_SHARPEDO_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_CAMERUPT_1[] = +static const union AnimCmd sAnim_CAMERUPT_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_ALTARIA_1[] = +static const union AnimCmd sAnim_ALTARIA_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_BANETTE_1[] = +static const union AnimCmd sAnim_BANETTE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_ABSOL_1[] = +static const union AnimCmd sAnim_ABSOL_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_GLALIE_1[] = +static const union AnimCmd sAnim_GLALIE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_SALAMENCE_1[] = +static const union AnimCmd sAnim_SALAMENCE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_METAGROSS_1[] = +static const union AnimCmd sAnim_METAGROSS_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_LATIAS_1[] = +static const union AnimCmd sAnim_LATIAS_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_LATIOS_1[] = +static const union AnimCmd sAnim_LATIOS_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_PRIMAL_KYOGRE_1[] = +static const union AnimCmd sAnim_KYOGRE_PRIMAL_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_PRIMAL_GROUDON_1[] = +static const union AnimCmd sAnim_GROUDON_PRIMAL_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_RAYQUAZA_1[] = +static const union AnimCmd sAnim_RAYQUAZA_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_LOPUNNY_1[] = +static const union AnimCmd sAnim_LOPUNNY_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_GARCHOMP_1[] = +static const union AnimCmd sAnim_GARCHOMP_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_LUCARIO_1[] = +static const union AnimCmd sAnim_LUCARIO_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_ABOMASNOW_1[] = +static const union AnimCmd sAnim_ABOMASNOW_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_GALLADE_1[] = +static const union AnimCmd sAnim_GALLADE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_AUDINO_1[] = +static const union AnimCmd sAnim_AUDINO_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_MEGA_DIANCIE_1[] = +static const union AnimCmd sAnim_DIANCIE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_RATTATA_1[] = +static const union AnimCmd sAnim_RATTATA_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_RATICATE_1[] = +static const union AnimCmd sAnim_RATICATE_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_RAICHU_1[] = +static const union AnimCmd sAnim_RAICHU_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_SANDSHREW_1[] = +static const union AnimCmd sAnim_SANDSHREW_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_SANDSLASH_1[] = +static const union AnimCmd sAnim_SANDSLASH_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_VULPIX_1[] = +static const union AnimCmd sAnim_VULPIX_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_NINETALES_1[] = +static const union AnimCmd sAnim_NINETALES_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_DIGLETT_1[] = +static const union AnimCmd sAnim_DIGLETT_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_DUGTRIO_1[] = +static const union AnimCmd sAnim_DUGTRIO_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_MEOWTH_1[] = +static const union AnimCmd sAnim_MEOWTH_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_PERSIAN_1[] = +static const union AnimCmd sAnim_PERSIAN_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_GEODUDE_1[] = +static const union AnimCmd sAnim_GEODUDE_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_GRAVELER_1[] = +static const union AnimCmd sAnim_GRAVELER_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_GOLEM_1[] = +static const union AnimCmd sAnim_GOLEM_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_GRIMER_1[] = +static const union AnimCmd sAnim_GRIMER_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_MUK_1[] = +static const union AnimCmd sAnim_MUK_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_EXEGGUTOR_1[] = +static const union AnimCmd sAnim_EXEGGUTOR_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sAnim_ALOLAN_MAROWAK_1[] = +static const union AnimCmd sAnim_MAROWAK_ALOLAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -12752,344 +12752,344 @@ static const union AnimCmd *const sAnims_MELMETAL[] ={ sAnim_MELMETAL_1, }; -static const union AnimCmd *const sAnims_MEGA_VENUSAUR[] ={ +static const union AnimCmd *const sAnims_VENUSAUR_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_VENUSAUR_1, + sAnim_VENUSAUR_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_CHARIZARD_X[] ={ +static const union AnimCmd *const sAnims_CHARIZARD_MEGA_X[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_CHARIZARD_X_1, + sAnim_CHARIZARD_MEGA_X_1, }; -static const union AnimCmd *const sAnims_MEGA_CHARIZARD_Y[] ={ +static const union AnimCmd *const sAnims_CHARIZARD_MEGA_Y[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_CHARIZARD_Y_1, + sAnim_CHARIZARD_MEGA_Y_1, }; -static const union AnimCmd *const sAnims_MEGA_BLASTOISE[] ={ +static const union AnimCmd *const sAnims_BLASTOISE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_BLASTOISE_1, + sAnim_BLASTOISE_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_BEEDRILL[] ={ +static const union AnimCmd *const sAnims_BEEDRILL_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_BEEDRILL_1, + sAnim_BEEDRILL_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_PIDGEOT[] ={ +static const union AnimCmd *const sAnims_PIDGEOT_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_PIDGEOT_1, + sAnim_PIDGEOT_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_ALAKAZAM[] ={ +static const union AnimCmd *const sAnims_ALAKAZAM_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_ALAKAZAM_1, + sAnim_ALAKAZAM_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_SLOWBRO[] ={ +static const union AnimCmd *const sAnims_SLOWBRO_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_SLOWBRO_1, + sAnim_SLOWBRO_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_GENGAR[] ={ +static const union AnimCmd *const sAnims_GENGAR_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_GENGAR_1, + sAnim_GENGAR_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_KANGASKHAN[] ={ +static const union AnimCmd *const sAnims_KANGASKHAN_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_KANGASKHAN_1, + sAnim_KANGASKHAN_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_PINSIR[] ={ +static const union AnimCmd *const sAnims_PINSIR_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_PINSIR_1, + sAnim_PINSIR_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_GYARADOS[] ={ +static const union AnimCmd *const sAnims_GYARADOS_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_GYARADOS_1, + sAnim_GYARADOS_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_AERODACTYL[] ={ +static const union AnimCmd *const sAnims_AERODACTYL_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_AERODACTYL_1, + sAnim_AERODACTYL_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_MEWTWO_X[] ={ +static const union AnimCmd *const sAnims_MEWTWO_MEGA_X[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_MEWTWO_X_1, + sAnim_MEWTWO_MEGA_X_1, }; -static const union AnimCmd *const sAnims_MEGA_MEWTWO_Y[] ={ +static const union AnimCmd *const sAnims_MEWTWO_MEGA_Y[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_MEWTWO_Y_1, + sAnim_MEWTWO_MEGA_Y_1, }; -static const union AnimCmd *const sAnims_MEGA_AMPHAROS[] ={ +static const union AnimCmd *const sAnims_AMPHAROS_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_AMPHAROS_1, + sAnim_AMPHAROS_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_STEELIX[] ={ +static const union AnimCmd *const sAnims_STEELIX_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_STEELIX_1, + sAnim_STEELIX_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_SCIZOR[] ={ +static const union AnimCmd *const sAnims_SCIZOR_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_SCIZOR_1, + sAnim_SCIZOR_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_HERACROSS[] ={ +static const union AnimCmd *const sAnims_HERACROSS_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_HERACROSS_1, + sAnim_HERACROSS_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_HOUNDOOM[] ={ +static const union AnimCmd *const sAnims_HOUNDOOM_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_HOUNDOOM_1, + sAnim_HOUNDOOM_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_TYRANITAR[] ={ +static const union AnimCmd *const sAnims_TYRANITAR_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_TYRANITAR_1, + sAnim_TYRANITAR_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_SCEPTILE[] ={ +static const union AnimCmd *const sAnims_SCEPTILE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_SCEPTILE_1, + sAnim_SCEPTILE_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_BLAZIKEN[] ={ +static const union AnimCmd *const sAnims_BLAZIKEN_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_BLAZIKEN_1, + sAnim_BLAZIKEN_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_SWAMPERT[] ={ +static const union AnimCmd *const sAnims_SWAMPERT_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_SWAMPERT_1, + sAnim_SWAMPERT_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_GARDEVOIR[] ={ +static const union AnimCmd *const sAnims_GARDEVOIR_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_GARDEVOIR_1, + sAnim_GARDEVOIR_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_SABLEYE[] ={ +static const union AnimCmd *const sAnims_SABLEYE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_SABLEYE_1, + sAnim_SABLEYE_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_MAWILE[] ={ +static const union AnimCmd *const sAnims_MAWILE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_MAWILE_1, + sAnim_MAWILE_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_AGGRON[] ={ +static const union AnimCmd *const sAnims_AGGRON_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_AGGRON_1, + sAnim_AGGRON_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_MEDICHAM[] ={ +static const union AnimCmd *const sAnims_MEDICHAM_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_MEDICHAM_1, + sAnim_MEDICHAM_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_MANECTRIC[] ={ +static const union AnimCmd *const sAnims_MANECTRIC_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_MANECTRIC_1, + sAnim_MANECTRIC_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_SHARPEDO[] ={ +static const union AnimCmd *const sAnims_SHARPEDO_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_SHARPEDO_1, + sAnim_SHARPEDO_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_CAMERUPT[] ={ +static const union AnimCmd *const sAnims_CAMERUPT_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_CAMERUPT_1, + sAnim_CAMERUPT_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_ALTARIA[] ={ +static const union AnimCmd *const sAnims_ALTARIA_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_ALTARIA_1, + sAnim_ALTARIA_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_BANETTE[] ={ +static const union AnimCmd *const sAnims_BANETTE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_BANETTE_1, + sAnim_BANETTE_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_ABSOL[] ={ +static const union AnimCmd *const sAnims_ABSOL_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_ABSOL_1, + sAnim_ABSOL_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_GLALIE[] ={ +static const union AnimCmd *const sAnims_GLALIE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_GLALIE_1, + sAnim_GLALIE_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_SALAMENCE[] ={ +static const union AnimCmd *const sAnims_SALAMENCE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_SALAMENCE_1, + sAnim_SALAMENCE_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_METAGROSS[] ={ +static const union AnimCmd *const sAnims_METAGROSS_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_METAGROSS_1, + sAnim_METAGROSS_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_LATIAS[] ={ +static const union AnimCmd *const sAnims_LATIAS_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_LATIAS_1, + sAnim_LATIAS_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_LATIOS[] ={ +static const union AnimCmd *const sAnims_LATIOS_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_LATIOS_1, + sAnim_LATIOS_MEGA_1, }; -static const union AnimCmd *const sAnims_PRIMAL_KYOGRE[] ={ +static const union AnimCmd *const sAnims_KYOGRE_PRIMAL[] ={ sAnim_GeneralFrame0, - sAnim_PRIMAL_KYOGRE_1, + sAnim_KYOGRE_PRIMAL_1, }; -static const union AnimCmd *const sAnims_PRIMAL_GROUDON[] ={ +static const union AnimCmd *const sAnims_GROUDON_PRIMAL[] ={ sAnim_GeneralFrame0, - sAnim_PRIMAL_GROUDON_1, + sAnim_GROUDON_PRIMAL_1, }; -static const union AnimCmd *const sAnims_MEGA_RAYQUAZA[] ={ +static const union AnimCmd *const sAnims_RAYQUAZA_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_RAYQUAZA_1, + sAnim_RAYQUAZA_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_LOPUNNY[] ={ +static const union AnimCmd *const sAnims_LOPUNNY_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_LOPUNNY_1, + sAnim_LOPUNNY_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_GARCHOMP[] ={ +static const union AnimCmd *const sAnims_GARCHOMP_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_GARCHOMP_1, + sAnim_GARCHOMP_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_LUCARIO[] ={ +static const union AnimCmd *const sAnims_LUCARIO_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_LUCARIO_1, + sAnim_LUCARIO_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_ABOMASNOW[] ={ +static const union AnimCmd *const sAnims_ABOMASNOW_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_ABOMASNOW_1, + sAnim_ABOMASNOW_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_GALLADE[] ={ +static const union AnimCmd *const sAnims_GALLADE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_GALLADE_1, + sAnim_GALLADE_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_AUDINO[] ={ +static const union AnimCmd *const sAnims_AUDINO_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_AUDINO_1, + sAnim_AUDINO_MEGA_1, }; -static const union AnimCmd *const sAnims_MEGA_DIANCIE[] ={ +static const union AnimCmd *const sAnims_DIANCIE_MEGA[] ={ sAnim_GeneralFrame0, - sAnim_MEGA_DIANCIE_1, + sAnim_DIANCIE_MEGA_1, }; -static const union AnimCmd *const sAnims_ALOLAN_RATTATA[] ={ +static const union AnimCmd *const sAnims_RATTATA_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_RATTATA_1, + sAnim_RATTATA_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_RATICATE[] ={ +static const union AnimCmd *const sAnims_RATICATE_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_RATICATE_1, + sAnim_RATICATE_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_RAICHU[] ={ +static const union AnimCmd *const sAnims_RAICHU_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_RAICHU_1, + sAnim_RAICHU_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_SANDSHREW[] ={ +static const union AnimCmd *const sAnims_SANDSHREW_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_SANDSHREW_1, + sAnim_SANDSHREW_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_SANDSLASH[] ={ +static const union AnimCmd *const sAnims_SANDSLASH_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_SANDSLASH_1, + sAnim_SANDSLASH_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_VULPIX[] ={ +static const union AnimCmd *const sAnims_VULPIX_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_VULPIX_1, + sAnim_VULPIX_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_NINETALES[] ={ +static const union AnimCmd *const sAnims_NINETALES_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_NINETALES_1, + sAnim_NINETALES_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_DIGLETT[] ={ +static const union AnimCmd *const sAnims_DIGLETT_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_DIGLETT_1, + sAnim_DIGLETT_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_DUGTRIO[] ={ +static const union AnimCmd *const sAnims_DUGTRIO_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_DUGTRIO_1, + sAnim_DUGTRIO_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_MEOWTH[] ={ +static const union AnimCmd *const sAnims_MEOWTH_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_MEOWTH_1, + sAnim_MEOWTH_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_PERSIAN[] ={ +static const union AnimCmd *const sAnims_PERSIAN_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_PERSIAN_1, + sAnim_PERSIAN_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_GEODUDE[] ={ +static const union AnimCmd *const sAnims_GEODUDE_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_GEODUDE_1, + sAnim_GEODUDE_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_GRAVELER[] ={ +static const union AnimCmd *const sAnims_GRAVELER_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_GRAVELER_1, + sAnim_GRAVELER_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_GOLEM[] ={ +static const union AnimCmd *const sAnims_GOLEM_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_GOLEM_1, + sAnim_GOLEM_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_GRIMER[] ={ +static const union AnimCmd *const sAnims_GRIMER_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_GRIMER_1, + sAnim_GRIMER_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_MUK[] ={ +static const union AnimCmd *const sAnims_MUK_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_MUK_1, + sAnim_MUK_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_EXEGGUTOR[] ={ +static const union AnimCmd *const sAnims_EXEGGUTOR_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_EXEGGUTOR_1, + sAnim_EXEGGUTOR_ALOLAN_1, }; -static const union AnimCmd *const sAnims_ALOLAN_MAROWAK[] ={ +static const union AnimCmd *const sAnims_MAROWAK_ALOLAN[] ={ sAnim_GeneralFrame0, - sAnim_ALOLAN_MAROWAK_1, + sAnim_MAROWAK_ALOLAN_1, }; static const union AnimCmd *const sAnims_SHAYMIN_SKY[] ={ @@ -14015,74 +14015,74 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(ZERAORA), ANIM_CMD(MELTAN), ANIM_CMD(MELMETAL), - ANIM_CMD(MEGA_VENUSAUR), - ANIM_CMD(MEGA_CHARIZARD_X), - ANIM_CMD(MEGA_CHARIZARD_Y), - ANIM_CMD(MEGA_BLASTOISE), - ANIM_CMD(MEGA_BEEDRILL), - ANIM_CMD(MEGA_PIDGEOT), - ANIM_CMD(MEGA_ALAKAZAM), - ANIM_CMD(MEGA_SLOWBRO), - ANIM_CMD(MEGA_GENGAR), - ANIM_CMD(MEGA_KANGASKHAN), - ANIM_CMD(MEGA_PINSIR), - ANIM_CMD(MEGA_GYARADOS), - ANIM_CMD(MEGA_AERODACTYL), - ANIM_CMD(MEGA_MEWTWO_X), - ANIM_CMD(MEGA_MEWTWO_Y), - ANIM_CMD(MEGA_AMPHAROS), - ANIM_CMD(MEGA_STEELIX), - ANIM_CMD(MEGA_SCIZOR), - ANIM_CMD(MEGA_HERACROSS), - ANIM_CMD(MEGA_HOUNDOOM), - ANIM_CMD(MEGA_TYRANITAR), - ANIM_CMD(MEGA_SCEPTILE), - ANIM_CMD(MEGA_BLAZIKEN), - ANIM_CMD(MEGA_SWAMPERT), - ANIM_CMD(MEGA_GARDEVOIR), - ANIM_CMD(MEGA_SABLEYE), - ANIM_CMD(MEGA_MAWILE), - ANIM_CMD(MEGA_AGGRON), - ANIM_CMD(MEGA_MEDICHAM), - ANIM_CMD(MEGA_MANECTRIC), - ANIM_CMD(MEGA_SHARPEDO), - ANIM_CMD(MEGA_CAMERUPT), - ANIM_CMD(MEGA_ALTARIA), - ANIM_CMD(MEGA_BANETTE), - ANIM_CMD(MEGA_ABSOL), - ANIM_CMD(MEGA_GLALIE), - ANIM_CMD(MEGA_SALAMENCE), - ANIM_CMD(MEGA_METAGROSS), - ANIM_CMD(MEGA_LATIAS), - ANIM_CMD(MEGA_LATIOS), - ANIM_CMD(MEGA_LOPUNNY), - ANIM_CMD(MEGA_GARCHOMP), - ANIM_CMD(MEGA_LUCARIO), - ANIM_CMD(MEGA_ABOMASNOW), - ANIM_CMD(MEGA_GALLADE), - ANIM_CMD(MEGA_AUDINO), - ANIM_CMD(MEGA_DIANCIE), - ANIM_CMD(MEGA_RAYQUAZA), - ANIM_CMD(PRIMAL_KYOGRE), - ANIM_CMD(PRIMAL_GROUDON), - ANIM_CMD(ALOLAN_RATTATA), - ANIM_CMD(ALOLAN_RATICATE), - ANIM_CMD(ALOLAN_RAICHU), - ANIM_CMD(ALOLAN_SANDSHREW), - ANIM_CMD(ALOLAN_SANDSLASH), - ANIM_CMD(ALOLAN_VULPIX), - ANIM_CMD(ALOLAN_NINETALES), - ANIM_CMD(ALOLAN_DIGLETT), - ANIM_CMD(ALOLAN_DUGTRIO), - ANIM_CMD(ALOLAN_MEOWTH), - ANIM_CMD(ALOLAN_PERSIAN), - ANIM_CMD(ALOLAN_GEODUDE), - ANIM_CMD(ALOLAN_GRAVELER), - ANIM_CMD(ALOLAN_GOLEM), - ANIM_CMD(ALOLAN_GRIMER), - ANIM_CMD(ALOLAN_MUK), - ANIM_CMD(ALOLAN_EXEGGUTOR), - ANIM_CMD(ALOLAN_MAROWAK), + ANIM_CMD(VENUSAUR_MEGA), + ANIM_CMD(CHARIZARD_MEGA_X), + ANIM_CMD(CHARIZARD_MEGA_Y), + ANIM_CMD(BLASTOISE_MEGA), + ANIM_CMD(BEEDRILL_MEGA), + ANIM_CMD(PIDGEOT_MEGA), + ANIM_CMD(ALAKAZAM_MEGA), + ANIM_CMD(SLOWBRO_MEGA), + ANIM_CMD(GENGAR_MEGA), + ANIM_CMD(KANGASKHAN_MEGA), + ANIM_CMD(PINSIR_MEGA), + ANIM_CMD(GYARADOS_MEGA), + ANIM_CMD(AERODACTYL_MEGA), + ANIM_CMD(MEWTWO_MEGA_X), + ANIM_CMD(MEWTWO_MEGA_Y), + ANIM_CMD(AMPHAROS_MEGA), + ANIM_CMD(STEELIX_MEGA), + ANIM_CMD(SCIZOR_MEGA), + ANIM_CMD(HERACROSS_MEGA), + ANIM_CMD(HOUNDOOM_MEGA), + ANIM_CMD(TYRANITAR_MEGA), + ANIM_CMD(SCEPTILE_MEGA), + ANIM_CMD(BLAZIKEN_MEGA), + ANIM_CMD(SWAMPERT_MEGA), + ANIM_CMD(GARDEVOIR_MEGA), + ANIM_CMD(SABLEYE_MEGA), + ANIM_CMD(MAWILE_MEGA), + ANIM_CMD(AGGRON_MEGA), + ANIM_CMD(MEDICHAM_MEGA), + ANIM_CMD(MANECTRIC_MEGA), + ANIM_CMD(SHARPEDO_MEGA), + ANIM_CMD(CAMERUPT_MEGA), + ANIM_CMD(ALTARIA_MEGA), + ANIM_CMD(BANETTE_MEGA), + ANIM_CMD(ABSOL_MEGA), + ANIM_CMD(GLALIE_MEGA), + ANIM_CMD(SALAMENCE_MEGA), + ANIM_CMD(METAGROSS_MEGA), + ANIM_CMD(LATIAS_MEGA), + ANIM_CMD(LATIOS_MEGA), + ANIM_CMD(LOPUNNY_MEGA), + ANIM_CMD(GARCHOMP_MEGA), + ANIM_CMD(LUCARIO_MEGA), + ANIM_CMD(ABOMASNOW_MEGA), + ANIM_CMD(GALLADE_MEGA), + ANIM_CMD(AUDINO_MEGA), + ANIM_CMD(DIANCIE_MEGA), + ANIM_CMD(RAYQUAZA_MEGA), + ANIM_CMD(KYOGRE_PRIMAL), + ANIM_CMD(GROUDON_PRIMAL), + ANIM_CMD(RATTATA_ALOLAN), + ANIM_CMD(RATICATE_ALOLAN), + ANIM_CMD(RAICHU_ALOLAN), + ANIM_CMD(SANDSHREW_ALOLAN), + ANIM_CMD(SANDSLASH_ALOLAN), + ANIM_CMD(VULPIX_ALOLAN), + ANIM_CMD(NINETALES_ALOLAN), + ANIM_CMD(DIGLETT_ALOLAN), + ANIM_CMD(DUGTRIO_ALOLAN), + ANIM_CMD(MEOWTH_ALOLAN), + ANIM_CMD(PERSIAN_ALOLAN), + ANIM_CMD(GEODUDE_ALOLAN), + ANIM_CMD(GRAVELER_ALOLAN), + ANIM_CMD(GOLEM_ALOLAN), + ANIM_CMD(GRIMER_ALOLAN), + ANIM_CMD(MUK_ALOLAN), + ANIM_CMD(EXEGGUTOR_ALOLAN), + ANIM_CMD(MAROWAK_ALOLAN), ANIM_CMD_FULL(PIKACHU_COSPLAY, sAnims_PIKACHU), ANIM_CMD_FULL(PIKACHU_ROCK_STAR, sAnims_PIKACHU), ANIM_CMD_FULL(PIKACHU_BELLE, sAnims_PIKACHU), @@ -14223,7 +14223,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(FURFROU_LA_REINE_TRIM, sAnims_FURFROU), ANIM_CMD_FULL(FURFROU_KABUKI_TRIM, sAnims_FURFROU), ANIM_CMD_FULL(FURFROU_PHARAOH_TRIM, sAnims_FURFROU), - ANIM_CMD_FULL(MEOWSTIC_F, sAnims_MEOWSTIC), + ANIM_CMD_FULL(MEOWSTIC_FEMALE, sAnims_MEOWSTIC), ANIM_CMD(AEGISLASH_BLADE), ANIM_CMD_FULL(PUMPKABOO_SMALL, sAnims_PUMPKABOO), ANIM_CMD_FULL(PUMPKABOO_LARGE, sAnims_PUMPKABOO), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 07878b6dda..b627f830d2 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -811,76 +811,76 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(MELTAN, gMonFrontPic_Meltan), SPECIES_SPRITE(MELMETAL, gMonFrontPic_Melmetal), - SPECIES_SPRITE(MEGA_VENUSAUR, gMonFrontPic_MegaVenusaur), - SPECIES_SPRITE(MEGA_CHARIZARD_X, gMonFrontPic_MegaCharizardX), - SPECIES_SPRITE(MEGA_CHARIZARD_Y, gMonFrontPic_MegaCharizardY), - SPECIES_SPRITE(MEGA_BLASTOISE, gMonFrontPic_MegaBlastoise), - SPECIES_SPRITE(MEGA_BEEDRILL, gMonFrontPic_MegaBeedrill), - SPECIES_SPRITE(MEGA_PIDGEOT, gMonFrontPic_MegaPidgeot), - SPECIES_SPRITE(MEGA_ALAKAZAM, gMonFrontPic_MegaAlakazam), - SPECIES_SPRITE(MEGA_SLOWBRO, gMonFrontPic_MegaSlowbro), - SPECIES_SPRITE(MEGA_GENGAR, gMonFrontPic_MegaGengar), - SPECIES_SPRITE(MEGA_KANGASKHAN, gMonFrontPic_MegaKangaskhan), - SPECIES_SPRITE(MEGA_PINSIR, gMonFrontPic_MegaPinsir), - SPECIES_SPRITE(MEGA_GYARADOS, gMonFrontPic_MegaGyarados), - SPECIES_SPRITE(MEGA_AERODACTYL, gMonFrontPic_MegaAerodactyl), - SPECIES_SPRITE(MEGA_MEWTWO_X, gMonFrontPic_MegaMewtwoX), - SPECIES_SPRITE(MEGA_MEWTWO_Y, gMonFrontPic_MegaMewtwoY), - SPECIES_SPRITE(MEGA_AMPHAROS, gMonFrontPic_MegaAmpharos), - SPECIES_SPRITE(MEGA_STEELIX, gMonFrontPic_MegaSteelix), - SPECIES_SPRITE(MEGA_SCIZOR, gMonFrontPic_MegaScizor), - SPECIES_SPRITE(MEGA_HERACROSS, gMonFrontPic_MegaHeracross), - SPECIES_SPRITE(MEGA_HOUNDOOM, gMonFrontPic_MegaHoundoom), - SPECIES_SPRITE(MEGA_TYRANITAR, gMonFrontPic_MegaTyranitar), - SPECIES_SPRITE(MEGA_SCEPTILE, gMonFrontPic_MegaSceptile), - SPECIES_SPRITE(MEGA_BLAZIKEN, gMonFrontPic_MegaBlaziken), - SPECIES_SPRITE(MEGA_SWAMPERT, gMonFrontPic_MegaSwampert), - SPECIES_SPRITE(MEGA_GARDEVOIR, gMonFrontPic_MegaGardevoir), - SPECIES_SPRITE(MEGA_SABLEYE, gMonFrontPic_MegaSableye), - SPECIES_SPRITE(MEGA_MAWILE, gMonFrontPic_MegaMawile), - SPECIES_SPRITE(MEGA_AGGRON, gMonFrontPic_MegaAggron), - SPECIES_SPRITE(MEGA_MEDICHAM, gMonFrontPic_MegaMedicham), - SPECIES_SPRITE(MEGA_MANECTRIC, gMonFrontPic_MegaManectric), - SPECIES_SPRITE(MEGA_SHARPEDO, gMonFrontPic_MegaSharpedo), - SPECIES_SPRITE(MEGA_CAMERUPT, gMonFrontPic_MegaCamerupt), - SPECIES_SPRITE(MEGA_ALTARIA, gMonFrontPic_MegaAltaria), - SPECIES_SPRITE(MEGA_BANETTE, gMonFrontPic_MegaBanette), - SPECIES_SPRITE(MEGA_ABSOL, gMonFrontPic_MegaAbsol), - SPECIES_SPRITE(MEGA_GLALIE, gMonFrontPic_MegaGlalie), - SPECIES_SPRITE(MEGA_SALAMENCE, gMonFrontPic_MegaSalamence), - SPECIES_SPRITE(MEGA_METAGROSS, gMonFrontPic_MegaMetagross), - SPECIES_SPRITE(MEGA_LATIAS, gMonFrontPic_MegaLatias), - SPECIES_SPRITE(MEGA_LATIOS, gMonFrontPic_MegaLatios), - SPECIES_SPRITE(MEGA_LOPUNNY, gMonFrontPic_MegaLopunny), - SPECIES_SPRITE(MEGA_GARCHOMP, gMonFrontPic_MegaGarchomp), - SPECIES_SPRITE(MEGA_LUCARIO, gMonFrontPic_MegaLucario), - SPECIES_SPRITE(MEGA_ABOMASNOW, gMonFrontPic_MegaAbomasnow), - SPECIES_SPRITE(MEGA_GALLADE, gMonFrontPic_MegaGallade), - SPECIES_SPRITE(MEGA_AUDINO, gMonFrontPic_MegaAudino), - SPECIES_SPRITE(MEGA_DIANCIE, gMonFrontPic_MegaDiancie), + SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_MegaVenusaur), + SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_MegaCharizardX), + SPECIES_SPRITE(CHARIZARD_MEGA_Y, gMonFrontPic_MegaCharizardY), + SPECIES_SPRITE(BLASTOISE_MEGA, gMonFrontPic_MegaBlastoise), + SPECIES_SPRITE(BEEDRILL_MEGA, gMonFrontPic_MegaBeedrill), + SPECIES_SPRITE(PIDGEOT_MEGA, gMonFrontPic_MegaPidgeot), + SPECIES_SPRITE(ALAKAZAM_MEGA, gMonFrontPic_MegaAlakazam), + SPECIES_SPRITE(SLOWBRO_MEGA, gMonFrontPic_MegaSlowbro), + SPECIES_SPRITE(GENGAR_MEGA, gMonFrontPic_MegaGengar), + SPECIES_SPRITE(KANGASKHAN_MEGA, gMonFrontPic_MegaKangaskhan), + SPECIES_SPRITE(PINSIR_MEGA, gMonFrontPic_MegaPinsir), + SPECIES_SPRITE(GYARADOS_MEGA, gMonFrontPic_MegaGyarados), + SPECIES_SPRITE(AERODACTYL_MEGA, gMonFrontPic_MegaAerodactyl), + SPECIES_SPRITE(MEWTWO_MEGA_X, gMonFrontPic_MegaMewtwoX), + SPECIES_SPRITE(MEWTWO_MEGA_Y, gMonFrontPic_MegaMewtwoY), + SPECIES_SPRITE(AMPHAROS_MEGA, gMonFrontPic_MegaAmpharos), + SPECIES_SPRITE(STEELIX_MEGA, gMonFrontPic_MegaSteelix), + SPECIES_SPRITE(SCIZOR_MEGA, gMonFrontPic_MegaScizor), + SPECIES_SPRITE(HERACROSS_MEGA, gMonFrontPic_MegaHeracross), + SPECIES_SPRITE(HOUNDOOM_MEGA, gMonFrontPic_MegaHoundoom), + SPECIES_SPRITE(TYRANITAR_MEGA, gMonFrontPic_MegaTyranitar), + SPECIES_SPRITE(SCEPTILE_MEGA, gMonFrontPic_MegaSceptile), + SPECIES_SPRITE(BLAZIKEN_MEGA, gMonFrontPic_MegaBlaziken), + SPECIES_SPRITE(SWAMPERT_MEGA, gMonFrontPic_MegaSwampert), + SPECIES_SPRITE(GARDEVOIR_MEGA, gMonFrontPic_MegaGardevoir), + SPECIES_SPRITE(SABLEYE_MEGA, gMonFrontPic_MegaSableye), + SPECIES_SPRITE(MAWILE_MEGA, gMonFrontPic_MegaMawile), + SPECIES_SPRITE(AGGRON_MEGA, gMonFrontPic_MegaAggron), + SPECIES_SPRITE(MEDICHAM_MEGA, gMonFrontPic_MegaMedicham), + SPECIES_SPRITE(MANECTRIC_MEGA, gMonFrontPic_MegaManectric), + SPECIES_SPRITE(SHARPEDO_MEGA, gMonFrontPic_MegaSharpedo), + SPECIES_SPRITE(CAMERUPT_MEGA, gMonFrontPic_MegaCamerupt), + SPECIES_SPRITE(ALTARIA_MEGA, gMonFrontPic_MegaAltaria), + SPECIES_SPRITE(BANETTE_MEGA, gMonFrontPic_MegaBanette), + SPECIES_SPRITE(ABSOL_MEGA, gMonFrontPic_MegaAbsol), + SPECIES_SPRITE(GLALIE_MEGA, gMonFrontPic_MegaGlalie), + SPECIES_SPRITE(SALAMENCE_MEGA, gMonFrontPic_MegaSalamence), + SPECIES_SPRITE(METAGROSS_MEGA, gMonFrontPic_MegaMetagross), + SPECIES_SPRITE(LATIAS_MEGA, gMonFrontPic_MegaLatias), + SPECIES_SPRITE(LATIOS_MEGA, gMonFrontPic_MegaLatios), + SPECIES_SPRITE(LOPUNNY_MEGA, gMonFrontPic_MegaLopunny), + SPECIES_SPRITE(GARCHOMP_MEGA, gMonFrontPic_MegaGarchomp), + SPECIES_SPRITE(LUCARIO_MEGA, gMonFrontPic_MegaLucario), + SPECIES_SPRITE(ABOMASNOW_MEGA, gMonFrontPic_MegaAbomasnow), + SPECIES_SPRITE(GALLADE_MEGA, gMonFrontPic_MegaGallade), + SPECIES_SPRITE(AUDINO_MEGA, gMonFrontPic_MegaAudino), + SPECIES_SPRITE(DIANCIE_MEGA, gMonFrontPic_MegaDiancie), - SPECIES_SPRITE(MEGA_RAYQUAZA, gMonFrontPic_MegaRayquaza), - SPECIES_SPRITE(PRIMAL_KYOGRE, gMonFrontPic_PrimalKyogre), - SPECIES_SPRITE(PRIMAL_GROUDON, gMonFrontPic_PrimalGroudon), + SPECIES_SPRITE(RAYQUAZA_MEGA, gMonFrontPic_MegaRayquaza), + SPECIES_SPRITE(KYOGRE_PRIMAL, gMonFrontPic_PrimalKyogre), + SPECIES_SPRITE(GROUDON_PRIMAL, gMonFrontPic_PrimalGroudon), - SPECIES_SPRITE(ALOLAN_RATTATA, gMonFrontPic_AlolanRattata), - SPECIES_SPRITE(ALOLAN_RATICATE, gMonFrontPic_AlolanRaticate), - SPECIES_SPRITE(ALOLAN_RAICHU, gMonFrontPic_AlolanRaichu), - SPECIES_SPRITE(ALOLAN_SANDSHREW, gMonFrontPic_AlolanSandshrew), - SPECIES_SPRITE(ALOLAN_SANDSLASH, gMonFrontPic_AlolanSandslash), - SPECIES_SPRITE(ALOLAN_VULPIX, gMonFrontPic_AlolanVulpix), - SPECIES_SPRITE(ALOLAN_NINETALES, gMonFrontPic_AlolanNinetales), - SPECIES_SPRITE(ALOLAN_DIGLETT, gMonFrontPic_AlolanDiglett), - SPECIES_SPRITE(ALOLAN_DUGTRIO, gMonFrontPic_AlolanDugtrio), - SPECIES_SPRITE(ALOLAN_MEOWTH, gMonFrontPic_AlolanMeowth), - SPECIES_SPRITE(ALOLAN_PERSIAN, gMonFrontPic_AlolanPersian), - SPECIES_SPRITE(ALOLAN_GEODUDE, gMonFrontPic_AlolanGeodude), - SPECIES_SPRITE(ALOLAN_GRAVELER, gMonFrontPic_AlolanGraveler), - SPECIES_SPRITE(ALOLAN_GOLEM, gMonFrontPic_AlolanGolem), - SPECIES_SPRITE(ALOLAN_GRIMER, gMonFrontPic_AlolanGrimer), - SPECIES_SPRITE(ALOLAN_MUK, gMonFrontPic_AlolanMuk), - SPECIES_SPRITE(ALOLAN_EXEGGUTOR, gMonFrontPic_AlolanExeggutor), - SPECIES_SPRITE(ALOLAN_MAROWAK, gMonFrontPic_AlolanMarowak), + SPECIES_SPRITE(RATTATA_ALOLAN, gMonFrontPic_AlolanRattata), + SPECIES_SPRITE(RATICATE_ALOLAN, gMonFrontPic_AlolanRaticate), + SPECIES_SPRITE(RAICHU_ALOLAN, gMonFrontPic_AlolanRaichu), + SPECIES_SPRITE(SANDSHREW_ALOLAN, gMonFrontPic_AlolanSandshrew), + SPECIES_SPRITE(SANDSLASH_ALOLAN, gMonFrontPic_AlolanSandslash), + SPECIES_SPRITE(VULPIX_ALOLAN, gMonFrontPic_AlolanVulpix), + SPECIES_SPRITE(NINETALES_ALOLAN, gMonFrontPic_AlolanNinetales), + SPECIES_SPRITE(DIGLETT_ALOLAN, gMonFrontPic_AlolanDiglett), + SPECIES_SPRITE(DUGTRIO_ALOLAN, gMonFrontPic_AlolanDugtrio), + SPECIES_SPRITE(MEOWTH_ALOLAN, gMonFrontPic_AlolanMeowth), + SPECIES_SPRITE(PERSIAN_ALOLAN, gMonFrontPic_AlolanPersian), + SPECIES_SPRITE(GEODUDE_ALOLAN, gMonFrontPic_AlolanGeodude), + SPECIES_SPRITE(GRAVELER_ALOLAN, gMonFrontPic_AlolanGraveler), + SPECIES_SPRITE(GOLEM_ALOLAN, gMonFrontPic_AlolanGolem), + SPECIES_SPRITE(GRIMER_ALOLAN, gMonFrontPic_AlolanGrimer), + SPECIES_SPRITE(MUK_ALOLAN, gMonFrontPic_AlolanMuk), + SPECIES_SPRITE(EXEGGUTOR_ALOLAN, gMonFrontPic_AlolanExeggutor), + SPECIES_SPRITE(MAROWAK_ALOLAN, gMonFrontPic_AlolanMarowak), SPECIES_SPRITE(PIKACHU_COSPLAY, gMonFrontPic_PikachuCosplay), SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonFrontPic_PikachuRockStar), @@ -1052,7 +1052,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(FURFROU_KABUKI_TRIM, gMonFrontPic_FurfrouKabukiTrim), SPECIES_SPRITE(FURFROU_PHARAOH_TRIM, gMonFrontPic_FurfrouPharaohTrim), - SPECIES_SPRITE(MEOWSTIC_F, gMonFrontPic_MeowsticFemale), + SPECIES_SPRITE(MEOWSTIC_FEMALE, gMonFrontPic_MeowsticFemale), SPECIES_SPRITE(AEGISLASH_BLADE, gMonFrontPic_AegislashBlade), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index c3637eb5f0..b67c1319f5 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -811,76 +811,76 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MELTAN, gMonPalette_Meltan), SPECIES_PAL(MELMETAL, gMonPalette_Melmetal), - SPECIES_PAL(MEGA_VENUSAUR, gMonPalette_MegaVenusaur), - SPECIES_PAL(MEGA_CHARIZARD_X, gMonPalette_MegaCharizardX), - SPECIES_PAL(MEGA_CHARIZARD_Y, gMonPalette_MegaCharizardY), - SPECIES_PAL(MEGA_BLASTOISE, gMonPalette_MegaBlastoise), - SPECIES_PAL(MEGA_BEEDRILL, gMonPalette_MegaBeedrill), - SPECIES_PAL(MEGA_PIDGEOT, gMonPalette_MegaPidgeot), - SPECIES_PAL(MEGA_ALAKAZAM, gMonPalette_MegaAlakazam), - SPECIES_PAL(MEGA_SLOWBRO, gMonPalette_MegaSlowbro), - SPECIES_PAL(MEGA_GENGAR, gMonPalette_MegaGengar), - SPECIES_PAL(MEGA_KANGASKHAN, gMonPalette_MegaKangaskhan), - SPECIES_PAL(MEGA_PINSIR, gMonPalette_MegaPinsir), - SPECIES_PAL(MEGA_GYARADOS, gMonPalette_MegaGyarados), - SPECIES_PAL(MEGA_AERODACTYL, gMonPalette_MegaAerodactyl), - SPECIES_PAL(MEGA_MEWTWO_X, gMonPalette_MegaMewtwoX), - SPECIES_PAL(MEGA_MEWTWO_Y, gMonPalette_MegaMewtwoY), - SPECIES_PAL(MEGA_AMPHAROS, gMonPalette_MegaAmpharos), - SPECIES_PAL(MEGA_STEELIX, gMonPalette_MegaSteelix), - SPECIES_PAL(MEGA_SCIZOR, gMonPalette_MegaScizor), - SPECIES_PAL(MEGA_HERACROSS, gMonPalette_MegaHeracross), - SPECIES_PAL(MEGA_HOUNDOOM, gMonPalette_MegaHoundoom), - SPECIES_PAL(MEGA_TYRANITAR, gMonPalette_MegaTyranitar), - SPECIES_PAL(MEGA_SCEPTILE, gMonPalette_MegaSceptile), - SPECIES_PAL(MEGA_BLAZIKEN, gMonPalette_MegaBlaziken), - SPECIES_PAL(MEGA_SWAMPERT, gMonPalette_MegaSwampert), - SPECIES_PAL(MEGA_GARDEVOIR, gMonPalette_MegaGardevoir), - SPECIES_PAL(MEGA_SABLEYE, gMonPalette_MegaSableye), - SPECIES_PAL(MEGA_MAWILE, gMonPalette_MegaMawile), - SPECIES_PAL(MEGA_AGGRON, gMonPalette_MegaAggron), - SPECIES_PAL(MEGA_MEDICHAM, gMonPalette_MegaMedicham), - SPECIES_PAL(MEGA_MANECTRIC, gMonPalette_MegaManectric), - SPECIES_PAL(MEGA_SHARPEDO, gMonPalette_MegaSharpedo), - SPECIES_PAL(MEGA_CAMERUPT, gMonPalette_MegaCamerupt), - SPECIES_PAL(MEGA_ALTARIA, gMonPalette_MegaAltaria), - SPECIES_PAL(MEGA_BANETTE, gMonPalette_MegaBanette), - SPECIES_PAL(MEGA_ABSOL, gMonPalette_MegaAbsol), - SPECIES_PAL(MEGA_GLALIE, gMonPalette_MegaGlalie), - SPECIES_PAL(MEGA_SALAMENCE, gMonPalette_MegaSalamence), - SPECIES_PAL(MEGA_METAGROSS, gMonPalette_MegaMetagross), - SPECIES_PAL(MEGA_LATIAS, gMonPalette_MegaLatias), - SPECIES_PAL(MEGA_LATIOS, gMonPalette_MegaLatios), - SPECIES_PAL(MEGA_LOPUNNY, gMonPalette_MegaLopunny), - SPECIES_PAL(MEGA_GARCHOMP, gMonPalette_MegaGarchomp), - SPECIES_PAL(MEGA_LUCARIO, gMonPalette_MegaLucario), - SPECIES_PAL(MEGA_ABOMASNOW, gMonPalette_MegaAbomasnow), - SPECIES_PAL(MEGA_GALLADE, gMonPalette_MegaGallade), - SPECIES_PAL(MEGA_AUDINO, gMonPalette_MegaAudino), - SPECIES_PAL(MEGA_DIANCIE, gMonPalette_MegaDiancie), + SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_MegaVenusaur), + SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_MegaCharizardX), + SPECIES_PAL(CHARIZARD_MEGA_Y, gMonPalette_MegaCharizardY), + SPECIES_PAL(BLASTOISE_MEGA, gMonPalette_MegaBlastoise), + SPECIES_PAL(BEEDRILL_MEGA, gMonPalette_MegaBeedrill), + SPECIES_PAL(PIDGEOT_MEGA, gMonPalette_MegaPidgeot), + SPECIES_PAL(ALAKAZAM_MEGA, gMonPalette_MegaAlakazam), + SPECIES_PAL(SLOWBRO_MEGA, gMonPalette_MegaSlowbro), + SPECIES_PAL(GENGAR_MEGA, gMonPalette_MegaGengar), + SPECIES_PAL(KANGASKHAN_MEGA, gMonPalette_MegaKangaskhan), + SPECIES_PAL(PINSIR_MEGA, gMonPalette_MegaPinsir), + SPECIES_PAL(GYARADOS_MEGA, gMonPalette_MegaGyarados), + SPECIES_PAL(AERODACTYL_MEGA, gMonPalette_MegaAerodactyl), + SPECIES_PAL(MEWTWO_MEGA_X, gMonPalette_MegaMewtwoX), + SPECIES_PAL(MEWTWO_MEGA_Y, gMonPalette_MegaMewtwoY), + SPECIES_PAL(AMPHAROS_MEGA, gMonPalette_MegaAmpharos), + SPECIES_PAL(STEELIX_MEGA, gMonPalette_MegaSteelix), + SPECIES_PAL(SCIZOR_MEGA, gMonPalette_MegaScizor), + SPECIES_PAL(HERACROSS_MEGA, gMonPalette_MegaHeracross), + SPECIES_PAL(HOUNDOOM_MEGA, gMonPalette_MegaHoundoom), + SPECIES_PAL(TYRANITAR_MEGA, gMonPalette_MegaTyranitar), + SPECIES_PAL(SCEPTILE_MEGA, gMonPalette_MegaSceptile), + SPECIES_PAL(BLAZIKEN_MEGA, gMonPalette_MegaBlaziken), + SPECIES_PAL(SWAMPERT_MEGA, gMonPalette_MegaSwampert), + SPECIES_PAL(GARDEVOIR_MEGA, gMonPalette_MegaGardevoir), + SPECIES_PAL(SABLEYE_MEGA, gMonPalette_MegaSableye), + SPECIES_PAL(MAWILE_MEGA, gMonPalette_MegaMawile), + SPECIES_PAL(AGGRON_MEGA, gMonPalette_MegaAggron), + SPECIES_PAL(MEDICHAM_MEGA, gMonPalette_MegaMedicham), + SPECIES_PAL(MANECTRIC_MEGA, gMonPalette_MegaManectric), + SPECIES_PAL(SHARPEDO_MEGA, gMonPalette_MegaSharpedo), + SPECIES_PAL(CAMERUPT_MEGA, gMonPalette_MegaCamerupt), + SPECIES_PAL(ALTARIA_MEGA, gMonPalette_MegaAltaria), + SPECIES_PAL(BANETTE_MEGA, gMonPalette_MegaBanette), + SPECIES_PAL(ABSOL_MEGA, gMonPalette_MegaAbsol), + SPECIES_PAL(GLALIE_MEGA, gMonPalette_MegaGlalie), + SPECIES_PAL(SALAMENCE_MEGA, gMonPalette_MegaSalamence), + SPECIES_PAL(METAGROSS_MEGA, gMonPalette_MegaMetagross), + SPECIES_PAL(LATIAS_MEGA, gMonPalette_MegaLatias), + SPECIES_PAL(LATIOS_MEGA, gMonPalette_MegaLatios), + SPECIES_PAL(LOPUNNY_MEGA, gMonPalette_MegaLopunny), + SPECIES_PAL(GARCHOMP_MEGA, gMonPalette_MegaGarchomp), + SPECIES_PAL(LUCARIO_MEGA, gMonPalette_MegaLucario), + SPECIES_PAL(ABOMASNOW_MEGA, gMonPalette_MegaAbomasnow), + SPECIES_PAL(GALLADE_MEGA, gMonPalette_MegaGallade), + SPECIES_PAL(AUDINO_MEGA, gMonPalette_MegaAudino), + SPECIES_PAL(DIANCIE_MEGA, gMonPalette_MegaDiancie), - SPECIES_PAL(MEGA_RAYQUAZA, gMonPalette_MegaRayquaza), - SPECIES_PAL(PRIMAL_KYOGRE, gMonPalette_PrimalKyogre), - SPECIES_PAL(PRIMAL_GROUDON, gMonPalette_PrimalGroudon), + SPECIES_PAL(RAYQUAZA_MEGA, gMonPalette_MegaRayquaza), + SPECIES_PAL(KYOGRE_PRIMAL, gMonPalette_PrimalKyogre), + SPECIES_PAL(GROUDON_PRIMAL, gMonPalette_PrimalGroudon), - SPECIES_PAL(ALOLAN_RATTATA, gMonPalette_AlolanRattata), - SPECIES_PAL(ALOLAN_RATICATE, gMonPalette_AlolanRaticate), - SPECIES_PAL(ALOLAN_RAICHU, gMonPalette_AlolanRaichu), - SPECIES_PAL(ALOLAN_SANDSHREW, gMonPalette_AlolanSandshrew), - SPECIES_PAL(ALOLAN_SANDSLASH, gMonPalette_AlolanSandslash), - SPECIES_PAL(ALOLAN_VULPIX, gMonPalette_AlolanVulpix), - SPECIES_PAL(ALOLAN_NINETALES, gMonPalette_AlolanNinetales), - SPECIES_PAL(ALOLAN_DIGLETT, gMonPalette_AlolanDiglett), - SPECIES_PAL(ALOLAN_DUGTRIO, gMonPalette_AlolanDugtrio), - SPECIES_PAL(ALOLAN_MEOWTH, gMonPalette_AlolanMeowth), - SPECIES_PAL(ALOLAN_PERSIAN, gMonPalette_AlolanPersian), - SPECIES_PAL(ALOLAN_GEODUDE, gMonPalette_AlolanGeodude), - SPECIES_PAL(ALOLAN_GRAVELER, gMonPalette_AlolanGraveler), - SPECIES_PAL(ALOLAN_GOLEM, gMonPalette_AlolanGolem), - SPECIES_PAL(ALOLAN_GRIMER, gMonPalette_AlolanGrimer), - SPECIES_PAL(ALOLAN_MUK, gMonPalette_AlolanMuk), - SPECIES_PAL(ALOLAN_EXEGGUTOR, gMonPalette_AlolanExeggutor), - SPECIES_PAL(ALOLAN_MAROWAK, gMonPalette_AlolanMarowak), + SPECIES_PAL(RATTATA_ALOLAN, gMonPalette_AlolanRattata), + SPECIES_PAL(RATICATE_ALOLAN, gMonPalette_AlolanRaticate), + SPECIES_PAL(RAICHU_ALOLAN, gMonPalette_AlolanRaichu), + SPECIES_PAL(SANDSHREW_ALOLAN, gMonPalette_AlolanSandshrew), + SPECIES_PAL(SANDSLASH_ALOLAN, gMonPalette_AlolanSandslash), + SPECIES_PAL(VULPIX_ALOLAN, gMonPalette_AlolanVulpix), + SPECIES_PAL(NINETALES_ALOLAN, gMonPalette_AlolanNinetales), + SPECIES_PAL(DIGLETT_ALOLAN, gMonPalette_AlolanDiglett), + SPECIES_PAL(DUGTRIO_ALOLAN, gMonPalette_AlolanDugtrio), + SPECIES_PAL(MEOWTH_ALOLAN, gMonPalette_AlolanMeowth), + SPECIES_PAL(PERSIAN_ALOLAN, gMonPalette_AlolanPersian), + SPECIES_PAL(GEODUDE_ALOLAN, gMonPalette_AlolanGeodude), + SPECIES_PAL(GRAVELER_ALOLAN, gMonPalette_AlolanGraveler), + SPECIES_PAL(GOLEM_ALOLAN, gMonPalette_AlolanGolem), + SPECIES_PAL(GRIMER_ALOLAN, gMonPalette_AlolanGrimer), + SPECIES_PAL(MUK_ALOLAN, gMonPalette_AlolanMuk), + SPECIES_PAL(EXEGGUTOR_ALOLAN, gMonPalette_AlolanExeggutor), + SPECIES_PAL(MAROWAK_ALOLAN, gMonPalette_AlolanMarowak), SPECIES_PAL(PIKACHU_COSPLAY, gMonPalette_PikachuCosplay), SPECIES_PAL(PIKACHU_ROCK_STAR, gMonPalette_PikachuRockStar), @@ -1052,7 +1052,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(FURFROU_KABUKI_TRIM, gMonPalette_FurfrouKabukiTrim), SPECIES_PAL(FURFROU_PHARAOH_TRIM, gMonPalette_FurfrouPharaohTrim), - SPECIES_PAL(MEOWSTIC_F, gMonPalette_MeowsticFemale), + SPECIES_PAL(MEOWSTIC_FEMALE, gMonPalette_MeowsticFemale), SPECIES_PAL(AEGISLASH_BLADE, gMonPalette_AegislashBlade), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 47f3fd17d0..100f16d285 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -811,76 +811,76 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(MELTAN, gMonShinyPalette_Meltan), SPECIES_SHINY_PAL(MELMETAL, gMonShinyPalette_Melmetal), - SPECIES_SHINY_PAL(MEGA_VENUSAUR, gMonShinyPalette_MegaVenusaur), - SPECIES_SHINY_PAL(MEGA_CHARIZARD_X, gMonShinyPalette_MegaCharizardX), - SPECIES_SHINY_PAL(MEGA_CHARIZARD_Y, gMonShinyPalette_MegaCharizardY), - SPECIES_SHINY_PAL(MEGA_BLASTOISE, gMonShinyPalette_MegaBlastoise), - SPECIES_SHINY_PAL(MEGA_BEEDRILL, gMonShinyPalette_MegaBeedrill), - SPECIES_SHINY_PAL(MEGA_PIDGEOT, gMonShinyPalette_MegaPidgeot), - SPECIES_SHINY_PAL(MEGA_ALAKAZAM, gMonShinyPalette_MegaAlakazam), - SPECIES_SHINY_PAL(MEGA_SLOWBRO, gMonShinyPalette_MegaSlowbro), - SPECIES_SHINY_PAL(MEGA_GENGAR, gMonShinyPalette_MegaGengar), - SPECIES_SHINY_PAL(MEGA_KANGASKHAN, gMonShinyPalette_MegaKangaskhan), - SPECIES_SHINY_PAL(MEGA_PINSIR, gMonShinyPalette_MegaPinsir), - SPECIES_SHINY_PAL(MEGA_GYARADOS, gMonShinyPalette_MegaGyarados), - SPECIES_SHINY_PAL(MEGA_AERODACTYL, gMonShinyPalette_MegaAerodactyl), - SPECIES_SHINY_PAL(MEGA_MEWTWO_X, gMonShinyPalette_MegaMewtwoX), - SPECIES_SHINY_PAL(MEGA_MEWTWO_Y, gMonShinyPalette_MegaMewtwoY), - SPECIES_SHINY_PAL(MEGA_AMPHAROS, gMonShinyPalette_MegaAmpharos), - SPECIES_SHINY_PAL(MEGA_STEELIX, gMonShinyPalette_MegaSteelix), - SPECIES_SHINY_PAL(MEGA_SCIZOR, gMonShinyPalette_MegaScizor), - SPECIES_SHINY_PAL(MEGA_HERACROSS, gMonShinyPalette_MegaHeracross), - SPECIES_SHINY_PAL(MEGA_HOUNDOOM, gMonShinyPalette_MegaHoundoom), - SPECIES_SHINY_PAL(MEGA_TYRANITAR, gMonShinyPalette_MegaTyranitar), - SPECIES_SHINY_PAL(MEGA_SCEPTILE, gMonShinyPalette_MegaSceptile), - SPECIES_SHINY_PAL(MEGA_BLAZIKEN, gMonShinyPalette_MegaBlaziken), - SPECIES_SHINY_PAL(MEGA_SWAMPERT, gMonShinyPalette_MegaSwampert), - SPECIES_SHINY_PAL(MEGA_GARDEVOIR, gMonShinyPalette_MegaGardevoir), - SPECIES_SHINY_PAL(MEGA_SABLEYE, gMonShinyPalette_MegaSableye), - SPECIES_SHINY_PAL(MEGA_MAWILE, gMonShinyPalette_MegaMawile), - SPECIES_SHINY_PAL(MEGA_AGGRON, gMonShinyPalette_MegaAggron), - SPECIES_SHINY_PAL(MEGA_MEDICHAM, gMonShinyPalette_MegaMedicham), - SPECIES_SHINY_PAL(MEGA_MANECTRIC, gMonShinyPalette_MegaManectric), - SPECIES_SHINY_PAL(MEGA_SHARPEDO, gMonShinyPalette_MegaSharpedo), - SPECIES_SHINY_PAL(MEGA_CAMERUPT, gMonShinyPalette_MegaCamerupt), - SPECIES_SHINY_PAL(MEGA_ALTARIA, gMonShinyPalette_MegaAltaria), - SPECIES_SHINY_PAL(MEGA_BANETTE, gMonShinyPalette_MegaBanette), - SPECIES_SHINY_PAL(MEGA_ABSOL, gMonShinyPalette_MegaAbsol), - SPECIES_SHINY_PAL(MEGA_GLALIE, gMonShinyPalette_MegaGlalie), - SPECIES_SHINY_PAL(MEGA_SALAMENCE, gMonShinyPalette_MegaSalamence), - SPECIES_SHINY_PAL(MEGA_METAGROSS, gMonShinyPalette_MegaMetagross), - SPECIES_SHINY_PAL(MEGA_LATIAS, gMonShinyPalette_MegaLatias), - SPECIES_SHINY_PAL(MEGA_LATIOS, gMonShinyPalette_MegaLatios), - SPECIES_SHINY_PAL(MEGA_LOPUNNY, gMonShinyPalette_MegaLopunny), - SPECIES_SHINY_PAL(MEGA_GARCHOMP, gMonShinyPalette_MegaGarchomp), - SPECIES_SHINY_PAL(MEGA_LUCARIO, gMonShinyPalette_MegaLucario), - SPECIES_SHINY_PAL(MEGA_ABOMASNOW, gMonShinyPalette_MegaAbomasnow), - SPECIES_SHINY_PAL(MEGA_GALLADE, gMonShinyPalette_MegaGallade), - SPECIES_SHINY_PAL(MEGA_AUDINO, gMonShinyPalette_MegaAudino), - SPECIES_SHINY_PAL(MEGA_DIANCIE, gMonShinyPalette_MegaDiancie), + SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_MegaVenusaur), + SPECIES_SHINY_PAL(CHARIZARD_MEGA_X, gMonShinyPalette_MegaCharizardX), + SPECIES_SHINY_PAL(CHARIZARD_MEGA_Y, gMonShinyPalette_MegaCharizardY), + SPECIES_SHINY_PAL(BLASTOISE_MEGA, gMonShinyPalette_MegaBlastoise), + SPECIES_SHINY_PAL(BEEDRILL_MEGA, gMonShinyPalette_MegaBeedrill), + SPECIES_SHINY_PAL(PIDGEOT_MEGA, gMonShinyPalette_MegaPidgeot), + SPECIES_SHINY_PAL(ALAKAZAM_MEGA, gMonShinyPalette_MegaAlakazam), + SPECIES_SHINY_PAL(SLOWBRO_MEGA, gMonShinyPalette_MegaSlowbro), + SPECIES_SHINY_PAL(GENGAR_MEGA, gMonShinyPalette_MegaGengar), + SPECIES_SHINY_PAL(KANGASKHAN_MEGA, gMonShinyPalette_MegaKangaskhan), + SPECIES_SHINY_PAL(PINSIR_MEGA, gMonShinyPalette_MegaPinsir), + SPECIES_SHINY_PAL(GYARADOS_MEGA, gMonShinyPalette_MegaGyarados), + SPECIES_SHINY_PAL(AERODACTYL_MEGA, gMonShinyPalette_MegaAerodactyl), + SPECIES_SHINY_PAL(MEWTWO_MEGA_X, gMonShinyPalette_MegaMewtwoX), + SPECIES_SHINY_PAL(MEWTWO_MEGA_Y, gMonShinyPalette_MegaMewtwoY), + SPECIES_SHINY_PAL(AMPHAROS_MEGA, gMonShinyPalette_MegaAmpharos), + SPECIES_SHINY_PAL(STEELIX_MEGA, gMonShinyPalette_MegaSteelix), + SPECIES_SHINY_PAL(SCIZOR_MEGA, gMonShinyPalette_MegaScizor), + SPECIES_SHINY_PAL(HERACROSS_MEGA, gMonShinyPalette_MegaHeracross), + SPECIES_SHINY_PAL(HOUNDOOM_MEGA, gMonShinyPalette_MegaHoundoom), + SPECIES_SHINY_PAL(TYRANITAR_MEGA, gMonShinyPalette_MegaTyranitar), + SPECIES_SHINY_PAL(SCEPTILE_MEGA, gMonShinyPalette_MegaSceptile), + SPECIES_SHINY_PAL(BLAZIKEN_MEGA, gMonShinyPalette_MegaBlaziken), + SPECIES_SHINY_PAL(SWAMPERT_MEGA, gMonShinyPalette_MegaSwampert), + SPECIES_SHINY_PAL(GARDEVOIR_MEGA, gMonShinyPalette_MegaGardevoir), + SPECIES_SHINY_PAL(SABLEYE_MEGA, gMonShinyPalette_MegaSableye), + SPECIES_SHINY_PAL(MAWILE_MEGA, gMonShinyPalette_MegaMawile), + SPECIES_SHINY_PAL(AGGRON_MEGA, gMonShinyPalette_MegaAggron), + SPECIES_SHINY_PAL(MEDICHAM_MEGA, gMonShinyPalette_MegaMedicham), + SPECIES_SHINY_PAL(MANECTRIC_MEGA, gMonShinyPalette_MegaManectric), + SPECIES_SHINY_PAL(SHARPEDO_MEGA, gMonShinyPalette_MegaSharpedo), + SPECIES_SHINY_PAL(CAMERUPT_MEGA, gMonShinyPalette_MegaCamerupt), + SPECIES_SHINY_PAL(ALTARIA_MEGA, gMonShinyPalette_MegaAltaria), + SPECIES_SHINY_PAL(BANETTE_MEGA, gMonShinyPalette_MegaBanette), + SPECIES_SHINY_PAL(ABSOL_MEGA, gMonShinyPalette_MegaAbsol), + SPECIES_SHINY_PAL(GLALIE_MEGA, gMonShinyPalette_MegaGlalie), + SPECIES_SHINY_PAL(SALAMENCE_MEGA, gMonShinyPalette_MegaSalamence), + SPECIES_SHINY_PAL(METAGROSS_MEGA, gMonShinyPalette_MegaMetagross), + SPECIES_SHINY_PAL(LATIAS_MEGA, gMonShinyPalette_MegaLatias), + SPECIES_SHINY_PAL(LATIOS_MEGA, gMonShinyPalette_MegaLatios), + SPECIES_SHINY_PAL(LOPUNNY_MEGA, gMonShinyPalette_MegaLopunny), + SPECIES_SHINY_PAL(GARCHOMP_MEGA, gMonShinyPalette_MegaGarchomp), + SPECIES_SHINY_PAL(LUCARIO_MEGA, gMonShinyPalette_MegaLucario), + SPECIES_SHINY_PAL(ABOMASNOW_MEGA, gMonShinyPalette_MegaAbomasnow), + SPECIES_SHINY_PAL(GALLADE_MEGA, gMonShinyPalette_MegaGallade), + SPECIES_SHINY_PAL(AUDINO_MEGA, gMonShinyPalette_MegaAudino), + SPECIES_SHINY_PAL(DIANCIE_MEGA, gMonShinyPalette_MegaDiancie), - SPECIES_SHINY_PAL(MEGA_RAYQUAZA, gMonShinyPalette_MegaRayquaza), - SPECIES_SHINY_PAL(PRIMAL_KYOGRE, gMonShinyPalette_PrimalKyogre), - SPECIES_SHINY_PAL(PRIMAL_GROUDON, gMonShinyPalette_PrimalGroudon), + SPECIES_SHINY_PAL(RAYQUAZA_MEGA, gMonShinyPalette_MegaRayquaza), + SPECIES_SHINY_PAL(KYOGRE_PRIMAL, gMonShinyPalette_PrimalKyogre), + SPECIES_SHINY_PAL(GROUDON_PRIMAL, gMonShinyPalette_PrimalGroudon), - SPECIES_SHINY_PAL(ALOLAN_RATTATA, gMonShinyPalette_AlolanRattata), - SPECIES_SHINY_PAL(ALOLAN_RATICATE, gMonShinyPalette_AlolanRaticate), - SPECIES_SHINY_PAL(ALOLAN_RAICHU, gMonShinyPalette_AlolanRaichu), - SPECIES_SHINY_PAL(ALOLAN_SANDSHREW, gMonShinyPalette_AlolanSandshrew), - SPECIES_SHINY_PAL(ALOLAN_SANDSLASH, gMonShinyPalette_AlolanSandslash), - SPECIES_SHINY_PAL(ALOLAN_VULPIX, gMonShinyPalette_AlolanVulpix), - SPECIES_SHINY_PAL(ALOLAN_NINETALES, gMonShinyPalette_AlolanNinetales), - SPECIES_SHINY_PAL(ALOLAN_DIGLETT, gMonShinyPalette_AlolanDiglett), - SPECIES_SHINY_PAL(ALOLAN_DUGTRIO, gMonShinyPalette_AlolanDugtrio), - SPECIES_SHINY_PAL(ALOLAN_MEOWTH, gMonShinyPalette_AlolanMeowth), - SPECIES_SHINY_PAL(ALOLAN_PERSIAN, gMonShinyPalette_AlolanPersian), - SPECIES_SHINY_PAL(ALOLAN_GEODUDE, gMonShinyPalette_AlolanGeodude), - SPECIES_SHINY_PAL(ALOLAN_GRAVELER, gMonShinyPalette_AlolanGraveler), - SPECIES_SHINY_PAL(ALOLAN_GOLEM, gMonShinyPalette_AlolanGolem), - SPECIES_SHINY_PAL(ALOLAN_GRIMER, gMonShinyPalette_AlolanGrimer), - SPECIES_SHINY_PAL(ALOLAN_MUK, gMonShinyPalette_AlolanMuk), - SPECIES_SHINY_PAL(ALOLAN_EXEGGUTOR, gMonShinyPalette_AlolanExeggutor), - SPECIES_SHINY_PAL(ALOLAN_MAROWAK, gMonShinyPalette_AlolanMarowak), + SPECIES_SHINY_PAL(RATTATA_ALOLAN, gMonShinyPalette_AlolanRattata), + SPECIES_SHINY_PAL(RATICATE_ALOLAN, gMonShinyPalette_AlolanRaticate), + SPECIES_SHINY_PAL(RAICHU_ALOLAN, gMonShinyPalette_AlolanRaichu), + SPECIES_SHINY_PAL(SANDSHREW_ALOLAN, gMonShinyPalette_AlolanSandshrew), + SPECIES_SHINY_PAL(SANDSLASH_ALOLAN, gMonShinyPalette_AlolanSandslash), + SPECIES_SHINY_PAL(VULPIX_ALOLAN, gMonShinyPalette_AlolanVulpix), + SPECIES_SHINY_PAL(NINETALES_ALOLAN, gMonShinyPalette_AlolanNinetales), + SPECIES_SHINY_PAL(DIGLETT_ALOLAN, gMonShinyPalette_AlolanDiglett), + SPECIES_SHINY_PAL(DUGTRIO_ALOLAN, gMonShinyPalette_AlolanDugtrio), + SPECIES_SHINY_PAL(MEOWTH_ALOLAN, gMonShinyPalette_AlolanMeowth), + SPECIES_SHINY_PAL(PERSIAN_ALOLAN, gMonShinyPalette_AlolanPersian), + SPECIES_SHINY_PAL(GEODUDE_ALOLAN, gMonShinyPalette_AlolanGeodude), + SPECIES_SHINY_PAL(GRAVELER_ALOLAN, gMonShinyPalette_AlolanGraveler), + SPECIES_SHINY_PAL(GOLEM_ALOLAN, gMonShinyPalette_AlolanGolem), + SPECIES_SHINY_PAL(GRIMER_ALOLAN, gMonShinyPalette_AlolanGrimer), + SPECIES_SHINY_PAL(MUK_ALOLAN, gMonShinyPalette_AlolanMuk), + SPECIES_SHINY_PAL(EXEGGUTOR_ALOLAN, gMonShinyPalette_AlolanExeggutor), + SPECIES_SHINY_PAL(MAROWAK_ALOLAN, gMonShinyPalette_AlolanMarowak), SPECIES_SHINY_PAL(PIKACHU_COSPLAY, gMonShinyPalette_PikachuCosplay), SPECIES_SHINY_PAL(PIKACHU_ROCK_STAR, gMonShinyPalette_PikachuRockStar), @@ -1052,7 +1052,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(FURFROU_KABUKI_TRIM, gMonShinyPalette_FurfrouKabukiTrim), SPECIES_SHINY_PAL(FURFROU_PHARAOH_TRIM, gMonShinyPalette_FurfrouPharaohTrim), - SPECIES_SHINY_PAL(MEOWSTIC_F, gMonShinyPalette_MeowsticFemale), + SPECIES_SHINY_PAL(MEOWSTIC_FEMALE, gMonShinyPalette_MeowsticFemale), SPECIES_SHINY_PAL(AEGISLASH_BLADE, gMonShinyPalette_AegislashBlade),