diff --git a/include/constants/species.h b/include/constants/species.h index 6bb50b355..ff91c8090 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -817,78 +817,78 @@ #define FORMS_START SPECIES_MELMETAL // Megas -#define SPECIES_MEGA_VENUSAUR FORMS_START + 1 -#define SPECIES_MEGA_CHARIZARD_X FORMS_START + 2 -#define SPECIES_MEGA_CHARIZARD_Y FORMS_START + 3 -#define SPECIES_MEGA_BLASTOISE FORMS_START + 4 -#define SPECIES_MEGA_BEEDRILL FORMS_START + 5 -#define SPECIES_MEGA_PIDGEOT FORMS_START + 6 -#define SPECIES_MEGA_ALAKAZAM FORMS_START + 7 -#define SPECIES_MEGA_SLOWBRO FORMS_START + 8 -#define SPECIES_MEGA_GENGAR FORMS_START + 9 -#define SPECIES_MEGA_KANGASKHAN FORMS_START + 10 -#define SPECIES_MEGA_PINSIR FORMS_START + 11 -#define SPECIES_MEGA_GYARADOS FORMS_START + 12 -#define SPECIES_MEGA_AERODACTYL FORMS_START + 13 -#define SPECIES_MEGA_MEWTWO_X FORMS_START + 14 -#define SPECIES_MEGA_MEWTWO_Y FORMS_START + 15 -#define SPECIES_MEGA_AMPHAROS FORMS_START + 16 -#define SPECIES_MEGA_STEELIX FORMS_START + 17 -#define SPECIES_MEGA_SCIZOR FORMS_START + 18 -#define SPECIES_MEGA_HERACROSS FORMS_START + 19 -#define SPECIES_MEGA_HOUNDOOM FORMS_START + 20 -#define SPECIES_MEGA_TYRANITAR FORMS_START + 21 -#define SPECIES_MEGA_SCEPTILE FORMS_START + 22 -#define SPECIES_MEGA_BLAZIKEN FORMS_START + 23 -#define SPECIES_MEGA_SWAMPERT FORMS_START + 24 -#define SPECIES_MEGA_GARDEVOIR FORMS_START + 25 -#define SPECIES_MEGA_SABLEYE FORMS_START + 26 -#define SPECIES_MEGA_MAWILE FORMS_START + 27 -#define SPECIES_MEGA_AGGRON FORMS_START + 28 -#define SPECIES_MEGA_MEDICHAM FORMS_START + 29 -#define SPECIES_MEGA_MANECTRIC FORMS_START + 30 -#define SPECIES_MEGA_SHARPEDO FORMS_START + 31 -#define SPECIES_MEGA_CAMERUPT FORMS_START + 32 -#define SPECIES_MEGA_ALTARIA FORMS_START + 33 -#define SPECIES_MEGA_BANETTE FORMS_START + 34 -#define SPECIES_MEGA_ABSOL FORMS_START + 35 -#define SPECIES_MEGA_GLALIE FORMS_START + 36 -#define SPECIES_MEGA_SALAMENCE FORMS_START + 37 -#define SPECIES_MEGA_METAGROSS FORMS_START + 38 -#define SPECIES_MEGA_LATIAS FORMS_START + 39 -#define SPECIES_MEGA_LATIOS FORMS_START + 40 -#define SPECIES_MEGA_LOPUNNY FORMS_START + 41 -#define SPECIES_MEGA_GARCHOMP FORMS_START + 42 -#define SPECIES_MEGA_LUCARIO FORMS_START + 43 -#define SPECIES_MEGA_ABOMASNOW FORMS_START + 44 -#define SPECIES_MEGA_GALLADE FORMS_START + 45 -#define SPECIES_MEGA_AUDINO FORMS_START + 46 -#define SPECIES_MEGA_DIANCIE FORMS_START + 47 +#define SPECIES_VENUSAUR_MEGA FORMS_START + 1 +#define SPECIES_CHARIZARD_MEGA_X FORMS_START + 2 +#define SPECIES_CHARIZARD_MEGA_Y FORMS_START + 3 +#define SPECIES_BLASTOISE_MEGA FORMS_START + 4 +#define SPECIES_BEEDRILL_MEGA FORMS_START + 5 +#define SPECIES_PIDGEOT_MEGA FORMS_START + 6 +#define SPECIES_ALAKAZAM_MEGA FORMS_START + 7 +#define SPECIES_SLOWBRO_MEGA FORMS_START + 8 +#define SPECIES_GENGAR_MEGA FORMS_START + 9 +#define SPECIES_KANGASKHAN_MEGA FORMS_START + 10 +#define SPECIES_PINSIR_MEGA FORMS_START + 11 +#define SPECIES_GYARADOS_MEGA FORMS_START + 12 +#define SPECIES_AERODACTYL_MEGA FORMS_START + 13 +#define SPECIES_MEWTWO_MEGA_X FORMS_START + 14 +#define SPECIES_MEWTWO_MEGA_Y FORMS_START + 15 +#define SPECIES_AMPHAROS_MEGA FORMS_START + 16 +#define SPECIES_STEELIX_MEGA FORMS_START + 17 +#define SPECIES_SCIZOR_MEGA FORMS_START + 18 +#define SPECIES_HERACROSS_MEGA FORMS_START + 19 +#define SPECIES_HOUNDOOM_MEGA FORMS_START + 20 +#define SPECIES_TYRANITAR_MEGA FORMS_START + 21 +#define SPECIES_SCEPTILE_MEGA FORMS_START + 22 +#define SPECIES_BLAZIKEN_MEGA FORMS_START + 23 +#define SPECIES_SWAMPERT_MEGA FORMS_START + 24 +#define SPECIES_GARDEVOIR_MEGA FORMS_START + 25 +#define SPECIES_SABLEYE_MEGA FORMS_START + 26 +#define SPECIES_MAWILE_MEGA FORMS_START + 27 +#define SPECIES_AGGRON_MEGA FORMS_START + 28 +#define SPECIES_MEDICHAM_MEGA FORMS_START + 29 +#define SPECIES_MANECTRIC_MEGA FORMS_START + 30 +#define SPECIES_SHARPEDO_MEGA FORMS_START + 31 +#define SPECIES_CAMERUPT_MEGA FORMS_START + 32 +#define SPECIES_ALTARIA_MEGA FORMS_START + 33 +#define SPECIES_BANETTE_MEGA FORMS_START + 34 +#define SPECIES_ABSOL_MEGA FORMS_START + 35 +#define SPECIES_GLALIE_MEGA FORMS_START + 36 +#define SPECIES_SALAMENCE_MEGA FORMS_START + 37 +#define SPECIES_METAGROSS_MEGA FORMS_START + 38 +#define SPECIES_LATIAS_MEGA FORMS_START + 39 +#define SPECIES_LATIOS_MEGA FORMS_START + 40 +#define SPECIES_LOPUNNY_MEGA FORMS_START + 41 +#define SPECIES_GARCHOMP_MEGA FORMS_START + 42 +#define SPECIES_LUCARIO_MEGA FORMS_START + 43 +#define SPECIES_ABOMASNOW_MEGA FORMS_START + 44 +#define SPECIES_GALLADE_MEGA FORMS_START + 45 +#define SPECIES_AUDINO_MEGA FORMS_START + 46 +#define SPECIES_DIANCIE_MEGA FORMS_START + 47 // Special Mega + Primals -#define SPECIES_MEGA_RAYQUAZA FORMS_START + 48 -#define SPECIES_PRIMAL_KYOGRE FORMS_START + 49 -#define SPECIES_PRIMAL_GROUDON FORMS_START + 50 +#define SPECIES_RAYQUAZA_MEGA FORMS_START + 48 +#define SPECIES_KYOGRE_PRIMAL FORMS_START + 49 +#define SPECIES_GROUDON_PRIMAL FORMS_START + 50 // Alolan Forms -#define SPECIES_ALOLAN_RATTATA FORMS_START + 51 -#define SPECIES_ALOLAN_RATICATE FORMS_START + 52 -#define SPECIES_ALOLAN_RAICHU FORMS_START + 53 -#define SPECIES_ALOLAN_SANDSHREW FORMS_START + 54 -#define SPECIES_ALOLAN_SANDSLASH FORMS_START + 55 -#define SPECIES_ALOLAN_VULPIX FORMS_START + 56 -#define SPECIES_ALOLAN_NINETALES FORMS_START + 57 -#define SPECIES_ALOLAN_DIGLETT FORMS_START + 58 -#define SPECIES_ALOLAN_DUGTRIO FORMS_START + 59 -#define SPECIES_ALOLAN_MEOWTH FORMS_START + 60 -#define SPECIES_ALOLAN_PERSIAN FORMS_START + 61 -#define SPECIES_ALOLAN_GEODUDE FORMS_START + 62 -#define SPECIES_ALOLAN_GRAVELER FORMS_START + 63 -#define SPECIES_ALOLAN_GOLEM FORMS_START + 64 -#define SPECIES_ALOLAN_GRIMER FORMS_START + 65 -#define SPECIES_ALOLAN_MUK FORMS_START + 66 -#define SPECIES_ALOLAN_EXEGGUTOR FORMS_START + 67 -#define SPECIES_ALOLAN_MAROWAK FORMS_START + 68 +#define SPECIES_RATTATA_ALOLAN FORMS_START + 51 +#define SPECIES_RATICATE_ALOLAN FORMS_START + 52 +#define SPECIES_RAICHU_ALOLAN FORMS_START + 53 +#define SPECIES_SANDSHREW_ALOLAN FORMS_START + 54 +#define SPECIES_SANDSLASH_ALOLAN FORMS_START + 55 +#define SPECIES_VULPIX_ALOLAN FORMS_START + 56 +#define SPECIES_NINETALES_ALOLAN FORMS_START + 57 +#define SPECIES_DIGLETT_ALOLAN FORMS_START + 58 +#define SPECIES_DUGTRIO_ALOLAN FORMS_START + 59 +#define SPECIES_MEOWTH_ALOLAN FORMS_START + 60 +#define SPECIES_PERSIAN_ALOLAN FORMS_START + 61 +#define SPECIES_GEODUDE_ALOLAN FORMS_START + 62 +#define SPECIES_GRAVELER_ALOLAN FORMS_START + 63 +#define SPECIES_GOLEM_ALOLAN FORMS_START + 64 +#define SPECIES_GRIMER_ALOLAN FORMS_START + 65 +#define SPECIES_MUK_ALOLAN FORMS_START + 66 +#define SPECIES_EXEGGUTOR_ALOLAN FORMS_START + 67 +#define SPECIES_MAROWAK_ALOLAN FORMS_START + 68 // Misc Forms @@ -1093,7 +1093,7 @@ #define SPECIES_FURFROU_PHARAOH_TRIM FORMS_START + 208 // Meowstic -#define SPECIES_MEOWSTIC_F FORMS_START + 209 +#define SPECIES_MEOWSTIC_FEMALE FORMS_START + 209 // Aegislash #define SPECIES_AEGISLASH_BLADE FORMS_START + 210 diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index d79d19eaa..7eda4be7d 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -22921,7 +22921,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_VENUSAUR] = + [SPECIES_VENUSAUR_MEGA] = { .baseHP = 80, .baseAttack = 100, @@ -22946,7 +22946,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_CHARIZARD_X] = + [SPECIES_CHARIZARD_MEGA_X] = { .baseHP = 78, .baseAttack = 130, @@ -22974,7 +22974,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_CHARIZARD_Y] = + [SPECIES_CHARIZARD_MEGA_Y] = { .baseHP = 78, .baseAttack = 104, @@ -22998,7 +22998,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_BLASTOISE] = + [SPECIES_BLASTOISE_MEGA] = { .baseHP = 79, .baseAttack = 103, @@ -23026,7 +23026,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_BEEDRILL] = + [SPECIES_BEEDRILL_MEGA] = { .baseHP = 65, .baseAttack = 150, @@ -23056,7 +23056,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_PIDGEOT] = + [SPECIES_PIDGEOT_MEGA] = { .baseHP = 83, .baseAttack = 80, @@ -23084,7 +23084,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_ALAKAZAM] = + [SPECIES_ALAKAZAM_MEGA] = { .baseHP = 55, .baseAttack = 50, @@ -23113,7 +23113,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_SLOWBRO] = + [SPECIES_SLOWBRO_MEGA] = { .baseHP = 95, .baseAttack = 75, @@ -23138,7 +23138,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_GENGAR] = + [SPECIES_GENGAR_MEGA] = { .baseHP = 60, .baseAttack = 65, @@ -23162,7 +23162,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_KANGASKHAN] = + [SPECIES_KANGASKHAN_MEGA] = { .baseHP = 105, .baseAttack = 125, @@ -23190,7 +23190,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_PINSIR] = + [SPECIES_PINSIR_MEGA] = { .baseHP = 65, .baseAttack = 155, @@ -23218,7 +23218,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_GYARADOS] = + [SPECIES_GYARADOS_MEGA] = { .baseHP = 95, .baseAttack = 155, @@ -23246,7 +23246,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_AERODACTYL] = + [SPECIES_AERODACTYL_MEGA] = { .baseHP = 80, .baseAttack = 135, @@ -23274,7 +23274,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_MEWTWO_X] = + [SPECIES_MEWTWO_MEGA_X] = { .baseHP = 106, .baseAttack = 190, @@ -23302,7 +23302,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_MEWTWO_Y] = + [SPECIES_MEWTWO_MEGA_Y] = { .baseHP = 106, .baseAttack = 150, @@ -23326,7 +23326,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_AMPHAROS] = + [SPECIES_AMPHAROS_MEGA] = { .baseHP = 90, .baseAttack = 95, @@ -23354,7 +23354,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_STEELIX] = + [SPECIES_STEELIX_MEGA] = { .baseHP = 75, .baseAttack = 125, @@ -23383,7 +23383,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_SCIZOR] = + [SPECIES_SCIZOR_MEGA] = { .baseHP = 70, .baseAttack = 150, @@ -23411,7 +23411,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_HERACROSS] = + [SPECIES_HERACROSS_MEGA] = { .baseHP = 80, .baseAttack = 185, @@ -23439,7 +23439,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_HOUNDOOM] = + [SPECIES_HOUNDOOM_MEGA] = { .baseHP = 75, .baseAttack = 90, @@ -23467,7 +23467,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_TYRANITAR] = + [SPECIES_TYRANITAR_MEGA] = { .baseHP = 100, .baseAttack = 164, @@ -23491,7 +23491,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_SCEPTILE] = + [SPECIES_SCEPTILE_MEGA] = { .baseHP = 70, .baseAttack = 110, @@ -23515,7 +23515,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_BLAZIKEN] = + [SPECIES_BLAZIKEN_MEGA] = { .baseHP = 80, .baseAttack = 160, @@ -23539,7 +23539,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_SWAMPERT] = + [SPECIES_SWAMPERT_MEGA] = { .baseHP = 100, .baseAttack = 150, @@ -23563,7 +23563,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_GARDEVOIR] = + [SPECIES_GARDEVOIR_MEGA] = { .baseHP = 68, .baseAttack = 85, @@ -23591,7 +23591,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_SABLEYE] = + [SPECIES_SABLEYE_MEGA] = { .baseHP = 50, .baseAttack = 85, @@ -23620,7 +23620,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_MAWILE] = + [SPECIES_MAWILE_MEGA] = { .baseHP = 50, .baseAttack = 105, @@ -23645,7 +23645,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_AGGRON] = + [SPECIES_AGGRON_MEGA] = { .baseHP = 70, .baseAttack = 140, @@ -23674,7 +23674,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_MEDICHAM] = + [SPECIES_MEDICHAM_MEGA] = { .baseHP = 60, .baseAttack = 100, @@ -23698,7 +23698,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_MANECTRIC] = + [SPECIES_MANECTRIC_MEGA] = { .baseHP = 70, .baseAttack = 75, @@ -23722,7 +23722,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_SHARPEDO] = + [SPECIES_SHARPEDO_MEGA] = { .baseHP = 70, .baseAttack = 140, @@ -23751,7 +23751,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_CAMERUPT] = + [SPECIES_CAMERUPT_MEGA] = { .baseHP = 70, .baseAttack = 120, @@ -23780,7 +23780,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_ALTARIA] = + [SPECIES_ALTARIA_MEGA] = { .baseHP = 75, .baseAttack = 110, @@ -23808,7 +23808,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_BANETTE] = + [SPECIES_BANETTE_MEGA] = { .baseHP = 64, .baseAttack = 165, @@ -23837,7 +23837,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_ABSOL] = + [SPECIES_ABSOL_MEGA] = { .baseHP = 65, .baseAttack = 150, @@ -23865,7 +23865,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_GLALIE] = + [SPECIES_GLALIE_MEGA] = { .baseHP = 80, .baseAttack = 120, @@ -23893,7 +23893,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_SALAMENCE] = + [SPECIES_SALAMENCE_MEGA] = { .baseHP = 95, .baseAttack = 145, @@ -23922,7 +23922,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_METAGROSS] = + [SPECIES_METAGROSS_MEGA] = { .baseHP = 80, .baseAttack = 145, @@ -23951,7 +23951,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_LATIAS] = + [SPECIES_LATIAS_MEGA] = { .baseHP = 80, .baseAttack = 100, @@ -23975,7 +23975,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_LATIOS] = + [SPECIES_LATIOS_MEGA] = { .baseHP = 80, .baseAttack = 130, @@ -23999,7 +23999,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_LOPUNNY] = + [SPECIES_LOPUNNY_MEGA] = { .baseHP = 65, .baseAttack = 136, @@ -24027,7 +24027,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_GARCHOMP] = + [SPECIES_GARCHOMP_MEGA] = { .baseHP = 108, .baseAttack = 170, @@ -24055,7 +24055,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_LUCARIO] = + [SPECIES_LUCARIO_MEGA] = { .baseHP = 70, .baseAttack = 145, @@ -24084,7 +24084,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_ABOMASNOW] = + [SPECIES_ABOMASNOW_MEGA] = { .baseHP = 90, .baseAttack = 132, @@ -24114,7 +24114,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_GALLADE] = + [SPECIES_GALLADE_MEGA] = { .baseHP = 68, .baseAttack = 165, @@ -24138,7 +24138,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_AUDINO] = + [SPECIES_AUDINO_MEGA] = { .baseHP = 103, .baseAttack = 60, @@ -24168,7 +24168,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_DIANCIE] = + [SPECIES_DIANCIE_MEGA] = { .baseHP = 50, .baseAttack = 160, @@ -24197,7 +24197,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEGA_RAYQUAZA] = + [SPECIES_RAYQUAZA_MEGA] = { .baseHP = 105, .baseAttack = 180, @@ -24226,7 +24226,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_PRIMAL_KYOGRE] = + [SPECIES_KYOGRE_PRIMAL] = { .baseHP = 100, .baseAttack = 150, @@ -24254,7 +24254,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_PRIMAL_GROUDON] = + [SPECIES_GROUDON_PRIMAL] = { .baseHP = 100, .baseAttack = 180, @@ -24282,7 +24282,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_RATTATA] = + [SPECIES_RATTATA_ALOLAN] = { .baseHP = 30, .baseAttack = 56, @@ -24312,7 +24312,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_RATICATE] = + [SPECIES_RATICATE_ALOLAN] = { .baseHP = 75, .baseAttack = 71, @@ -24342,7 +24342,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_RAICHU] = + [SPECIES_RAICHU_ALOLAN] = { .baseHP = 60, .baseAttack = 85, @@ -24370,7 +24370,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_SANDSHREW] = + [SPECIES_SANDSHREW_ALOLAN] = { .baseHP = 50, .baseAttack = 75, @@ -24400,7 +24400,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_SANDSLASH] = + [SPECIES_SANDSLASH_ALOLAN] = { .baseHP = 75, .baseAttack = 100, @@ -24429,7 +24429,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_VULPIX] = + [SPECIES_VULPIX_ALOLAN] = { .baseHP = 38, .baseAttack = 41, @@ -24459,7 +24459,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_NINETALES] = + [SPECIES_NINETALES_ALOLAN] = { .baseHP = 73, .baseAttack = 67, @@ -24489,7 +24489,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_DIGLETT] = + [SPECIES_DIGLETT_ALOLAN] = { .baseHP = 10, .baseAttack = 55, @@ -24519,7 +24519,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_DUGTRIO] = + [SPECIES_DUGTRIO_ALOLAN] = { .baseHP = 35, .baseAttack = 100, @@ -24549,7 +24549,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_MEOWTH] = + [SPECIES_MEOWTH_ALOLAN] = { .baseHP = 40, .baseAttack = 35, @@ -24579,7 +24579,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_PERSIAN] = + [SPECIES_PERSIAN_ALOLAN] = { .baseHP = 65, .baseAttack = 60, @@ -24609,7 +24609,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_GEODUDE] = + [SPECIES_GEODUDE_ALOLAN] = { .baseHP = 40, .baseAttack = 80, @@ -24637,7 +24637,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_GRAVELER] = + [SPECIES_GRAVELER_ALOLAN] = { .baseHP = 55, .baseAttack = 95, @@ -24665,7 +24665,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_GOLEM] = + [SPECIES_GOLEM_ALOLAN] = { .baseHP = 80, .baseAttack = 120, @@ -24692,7 +24692,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_GRIMER] = + [SPECIES_GRIMER_ALOLAN] = { .baseHP = 80, .baseAttack = 80, @@ -24722,7 +24722,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_MUK] = + [SPECIES_MUK_ALOLAN] = { .baseHP = 105, .baseAttack = 105, @@ -24752,7 +24752,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_EXEGGUTOR] = + [SPECIES_EXEGGUTOR_ALOLAN] = { .baseHP = 95, .baseAttack = 105, @@ -24781,7 +24781,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ALOLAN_MAROWAK] = + [SPECIES_MAROWAK_ALOLAN] = { .baseHP = 60, .baseAttack = 80, @@ -28624,7 +28624,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEOWSTIC_F] = + [SPECIES_MEOWSTIC_FEMALE] = { .baseHP = 74, .baseAttack = 48, diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 41263a0f4..917b8c5c8 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -2,27 +2,27 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = { [SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR}}, [SPECIES_IVYSAUR] = {{EVO_LEVEL, 32, SPECIES_VENUSAUR}}, - [SPECIES_VENUSAUR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_VENUSAURITE*/ SPECIES_MEGA_VENUSAUR}}, + [SPECIES_VENUSAUR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_VENUSAURITE*/ SPECIES_VENUSAUR_MEGA}}, [SPECIES_CHARMANDER] = {{EVO_LEVEL, 16, SPECIES_CHARMELEON}}, [SPECIES_CHARMELEON] = {{EVO_LEVEL, 36, SPECIES_CHARIZARD}}, - [SPECIES_CHARIZARD] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_CHARIZARDITE_X*/ SPECIES_MEGA_CHARIZARD_X}, - {EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_CHARIZARDITE_Y*/ SPECIES_MEGA_CHARIZARD_Y}}, + [SPECIES_CHARIZARD] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_CHARIZARDITE_X*/ SPECIES_CHARIZARD_MEGA_X}, + {EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_CHARIZARDITE_Y*/ SPECIES_CHARIZARD_MEGA_Y}}, [SPECIES_SQUIRTLE] = {{EVO_LEVEL, 16, SPECIES_WARTORTLE}}, [SPECIES_WARTORTLE] = {{EVO_LEVEL, 36, SPECIES_BLASTOISE}}, - [SPECIES_BLASTOISE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_BLASTOISINITE*/ SPECIES_MEGA_BLASTOISE}}, + [SPECIES_BLASTOISE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_BLASTOISINITE*/ SPECIES_BLASTOISE_MEGA}}, [SPECIES_CATERPIE] = {{EVO_LEVEL, 7, SPECIES_METAPOD}}, [SPECIES_METAPOD] = {{EVO_LEVEL, 10, SPECIES_BUTTERFREE}}, [SPECIES_WEEDLE] = {{EVO_LEVEL, 7, SPECIES_KAKUNA}}, [SPECIES_KAKUNA] = {{EVO_LEVEL, 10, SPECIES_BEEDRILL}}, - [SPECIES_BEEDRILL] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_BEEDRILLITE*/ SPECIES_MEGA_BEEDRILL}}, + [SPECIES_BEEDRILL] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_BEEDRILLITE*/ SPECIES_BEEDRILL_MEGA}}, [SPECIES_PIDGEY] = {{EVO_LEVEL, 18, SPECIES_PIDGEOTTO}}, [SPECIES_PIDGEOTTO] = {{EVO_LEVEL, 36, SPECIES_PIDGEOT}}, - [SPECIES_PIDGEOT] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_PIDGEOTITE*/ SPECIES_MEGA_PIDGEOT}}, + [SPECIES_PIDGEOT] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_PIDGEOTITE*/ SPECIES_PIDGEOT_MEGA}}, [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE}}, [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW}}, [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK}}, [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_RAICHU}, - {EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_ALOLAN_RAICHU}}, + {EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_RAICHU_ALOLAN}}, [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH}}, [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA}}, [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_NONE,/*ITEM_MOON_STONE*/ SPECIES_NIDOQUEEN}}, @@ -48,7 +48,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_KINGS_ROCK*/ SPECIES_POLITOED}}, [SPECIES_ABRA] = {{EVO_LEVEL, 16, SPECIES_KADABRA}}, [SPECIES_KADABRA] = {{EVO_TRADE, 0, SPECIES_ALAKAZAM}}, - [SPECIES_ALAKAZAM] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ALAKAZITE*/ SPECIES_MEGA_ALAKAZAM}}, + [SPECIES_ALAKAZAM] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ALAKAZITE*/ SPECIES_ALAKAZAM_MEGA}}, [SPECIES_MACHOP] = {{EVO_LEVEL, 28, SPECIES_MACHOKE}}, [SPECIES_MACHOKE] = {{EVO_TRADE, 0, SPECIES_MACHAMP}}, [SPECIES_BELLSPROUT] = {{EVO_LEVEL, 21, SPECIES_WEEPINBELL}}, @@ -59,7 +59,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PONYTA] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}}, [SPECIES_SLOWPOKE] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO}, {EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_KINGS_ROCK*/ SPECIES_SLOWKING}}, - [SPECIES_SLOWBRO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SLOWBRONITE*/ SPECIES_MEGA_SLOWBRO}}, + [SPECIES_SLOWBRO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SLOWBRONITE*/ SPECIES_SLOWBRO_MEGA}}, [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}}, [SPECIES_MAGNETON] = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}}, [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}}, @@ -68,22 +68,22 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SHELLDER] = {{EVO_ITEM, ITEM_NONE,/*ITEM_WATER_STONE*/ SPECIES_CLOYSTER}}, [SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER}}, [SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR}}, - [SPECIES_GENGAR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GENGARITE*/ SPECIES_MEGA_GENGAR}}, + [SPECIES_GENGAR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GENGARITE*/ SPECIES_GENGAR_MEGA}}, [SPECIES_ONIX] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_METAL_COAT*/ SPECIES_STEELIX}}, [SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO}}, [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER}}, [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE}}, [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_EXEGGUTOR}, - {EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_ALOLAN_EXEGGUTOR}}, + {EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_EXEGGUTOR_ALOLAN}}, [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}, - {EVO_LEVEL_NIGHT, 28, SPECIES_ALOLAN_MAROWAK}}, + {EVO_LEVEL_NIGHT, 28, SPECIES_MAROWAK_ALOLAN}}, [SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}}, [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}}, [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}}, [SPECIES_RHYDON] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_PROTECTOR*/ SPECIES_RHYPERIOR}}, [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}}, [SPECIES_TANGELA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}}, - [SPECIES_KANGASKHAN] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_KANGASKHANITE*/ SPECIES_MEGA_KANGASKHAN}}, + [SPECIES_KANGASKHAN] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_KANGASKHANITE*/ SPECIES_KANGASKHAN_MEGA}}, [SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA}}, [SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_DRAGON_SCALE*/ SPECIES_KINGDRA}}, [SPECIES_GOLDEEN] = {{EVO_LEVEL, 33, SPECIES_SEAKING}}, @@ -91,9 +91,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SCYTHER] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_METAL_COAT*/ SPECIES_SCIZOR}}, [SPECIES_ELECTABUZZ] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_ELECTIRIZER*/ SPECIES_ELECTIVIRE}}, [SPECIES_MAGMAR] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_MAGMARIZER*/ SPECIES_MAGMORTAR}}, - [SPECIES_PINSIR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_PINSIRITE*/ SPECIES_MEGA_PINSIR}}, + [SPECIES_PINSIR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_PINSIRITE*/ SPECIES_PINSIR_MEGA}}, [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS}}, - [SPECIES_GYARADOS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GYARADOSITE*/ SPECIES_MEGA_GYARADOS}}, + [SPECIES_GYARADOS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GYARADOSITE*/ SPECIES_GYARADOS_MEGA}}, [SPECIES_EEVEE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_JOLTEON}, {EVO_ITEM, ITEM_NONE,/*ITEM_WATER_STONE*/ SPECIES_VAPOREON}, {EVO_ITEM, ITEM_NONE,/*ITEM_FIRE_STONE*/ SPECIES_FLAREON}, @@ -105,11 +105,11 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PORYGON] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_UP_GRADE*/ SPECIES_PORYGON2}}, [SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}}, [SPECIES_KABUTO] = {{EVO_LEVEL, 40, SPECIES_KABUTOPS}}, - [SPECIES_AERODACTYL] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AERODACTYLITE*/ SPECIES_MEGA_AERODACTYL}}, + [SPECIES_AERODACTYL] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AERODACTYLITE*/ SPECIES_AERODACTYL_MEGA}}, [SPECIES_DRATINI] = {{EVO_LEVEL, 30, SPECIES_DRAGONAIR}}, [SPECIES_DRAGONAIR] = {{EVO_LEVEL, 55, SPECIES_DRAGONITE}}, - [SPECIES_MEWTWO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MEWTWONITE_X*/ SPECIES_MEGA_MEWTWO_X}, - {EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MEWTWONITE_Y*/ SPECIES_MEGA_MEWTWO_Y}}, + [SPECIES_MEWTWO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MEWTWONITE_X*/ SPECIES_MEWTWO_MEGA_X}, + {EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MEWTWONITE_Y*/ SPECIES_MEWTWO_MEGA_Y}}, [SPECIES_CHIKORITA] = {{EVO_LEVEL, 16, SPECIES_BAYLEEF}}, [SPECIES_BAYLEEF] = {{EVO_LEVEL, 32, SPECIES_MEGANIUM}}, [SPECIES_CYNDAQUIL] = {{EVO_LEVEL, 14, SPECIES_QUILAVA}}, @@ -129,7 +129,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}}, [SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY}}, [SPECIES_FLAAFFY] = {{EVO_LEVEL, 30, SPECIES_AMPHAROS}}, - [SPECIES_AMPHAROS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AMPHAROSITE*/ SPECIES_MEGA_AMPHAROS}}, + [SPECIES_AMPHAROS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AMPHAROSITE*/ SPECIES_AMPHAROS_MEGA}}, [SPECIES_MARILL] = {{EVO_LEVEL, 18, SPECIES_AZUMARILL}}, [SPECIES_HOPPIP] = {{EVO_LEVEL, 18, SPECIES_SKIPLOOM}}, [SPECIES_SKIPLOOM] = {{EVO_LEVEL, 27, SPECIES_JUMPLUFF}}, @@ -141,10 +141,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_NONE,/*ITEM_DUSK_STONE*/ SPECIES_MISMAGIUS}}, [SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}}, [SPECIES_GLIGAR] = {{EVO_ITEM_HOLD_NIGHT, ITEM_NONE,/*ITEM_RAZOR_FANG*/ SPECIES_GLISCOR}}, - [SPECIES_STEELIX] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_STEELIXITE*/ SPECIES_MEGA_STEELIX}}, + [SPECIES_STEELIX] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_STEELIXITE*/ SPECIES_STEELIX_MEGA}}, [SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}}, - [SPECIES_SCIZOR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SCIZORITE*/ SPECIES_MEGA_SCIZOR}}, - [SPECIES_HERACROSS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_HERACRONITE*/ SPECIES_MEGA_HERACROSS}}, + [SPECIES_SCIZOR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SCIZORITE*/ SPECIES_SCIZOR_MEGA}}, + [SPECIES_HERACROSS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_HERACRONITE*/ SPECIES_HERACROSS_MEGA}}, [SPECIES_SNEASEL] = {{EVO_ITEM_HOLD_NIGHT, ITEM_NONE,/*ITEM_RAZOR_CLAW*/ SPECIES_WEAVILE}}, [SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}}, [SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}}, @@ -152,7 +152,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PILOSWINE] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_MAMOSWINE}}, [SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}}, [SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}}, - [SPECIES_HOUNDOOM] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_HOUNDOOMINITE*/ SPECIES_MEGA_HOUNDOOM}}, + [SPECIES_HOUNDOOM] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_HOUNDOOMINITE*/ SPECIES_HOUNDOOM_MEGA}}, [SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN}}, [SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_DUBIOUS_DISC*/ SPECIES_PORYGON_Z}}, [SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, @@ -163,16 +163,16 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_MAGBY] = {{EVO_LEVEL, 30, SPECIES_MAGMAR}}, [SPECIES_LARVITAR] = {{EVO_LEVEL, 30, SPECIES_PUPITAR}}, [SPECIES_PUPITAR] = {{EVO_LEVEL, 55, SPECIES_TYRANITAR}}, - [SPECIES_TYRANITAR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_TYRANITARITE*/ SPECIES_MEGA_TYRANITAR}}, + [SPECIES_TYRANITAR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_TYRANITARITE*/ SPECIES_TYRANITAR_MEGA}}, [SPECIES_TREECKO] = {{EVO_LEVEL, 16, SPECIES_GROVYLE}}, [SPECIES_GROVYLE] = {{EVO_LEVEL, 36, SPECIES_SCEPTILE}}, - [SPECIES_SCEPTILE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SCEPTILITE*/ SPECIES_MEGA_SCEPTILE}}, + [SPECIES_SCEPTILE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SCEPTILITE*/ SPECIES_SCEPTILE_MEGA}}, [SPECIES_TORCHIC] = {{EVO_LEVEL, 16, SPECIES_COMBUSKEN}}, [SPECIES_COMBUSKEN] = {{EVO_LEVEL, 36, SPECIES_BLAZIKEN}}, - [SPECIES_BLAZIKEN] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_BLAZIKENITE*/ SPECIES_MEGA_BLAZIKEN}}, + [SPECIES_BLAZIKEN] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_BLAZIKENITE*/ SPECIES_BLAZIKEN_MEGA}}, [SPECIES_MUDKIP] = {{EVO_LEVEL, 16, SPECIES_MARSHTOMP}}, [SPECIES_MARSHTOMP] = {{EVO_LEVEL, 36, SPECIES_SWAMPERT}}, - [SPECIES_SWAMPERT] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SWAMPERTITE*/ SPECIES_MEGA_SWAMPERT}}, + [SPECIES_SWAMPERT] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SWAMPERTITE*/ SPECIES_SWAMPERT_MEGA}}, [SPECIES_POOCHYENA] = {{EVO_LEVEL, 18, SPECIES_MIGHTYENA}}, [SPECIES_ZIGZAGOON] = {{EVO_LEVEL, 20, SPECIES_LINOONE}}, [SPECIES_WURMPLE] = {{EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, @@ -193,33 +193,33 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SKITTY] = {{EVO_ITEM, ITEM_NONE,/*ITEM_MOON_STONE*/ SPECIES_DELCATTY}}, [SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}}, [SPECIES_NOSEPASS] = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}}, - [SPECIES_SABLEYE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SABLENITE*/ SPECIES_MEGA_SABLEYE}}, + [SPECIES_SABLEYE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SABLENITE*/ SPECIES_SABLEYE_MEGA}}, [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}}, [SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}}, [SPECIES_FEEBAS] = {{EVO_BEAUTY, 170, SPECIES_MILOTIC}, {EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_PRISM_SCALE*/ SPECIES_MILOTIC}}, [SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO}}, - [SPECIES_SHARPEDO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SHARPEDONITE*/ SPECIES_MEGA_SHARPEDO}}, + [SPECIES_SHARPEDO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SHARPEDONITE*/ SPECIES_SHARPEDO_MEGA}}, [SPECIES_TRAPINCH] = {{EVO_LEVEL, 35, SPECIES_VIBRAVA}}, [SPECIES_VIBRAVA] = {{EVO_LEVEL, 45, SPECIES_FLYGON}}, [SPECIES_MAKUHITA] = {{EVO_LEVEL, 24, SPECIES_HARIYAMA}}, [SPECIES_ELECTRIKE] = {{EVO_LEVEL, 26, SPECIES_MANECTRIC}}, - [SPECIES_MANECTRIC] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MANECTITE*/ SPECIES_MEGA_MANECTRIC}}, + [SPECIES_MANECTRIC] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MANECTITE*/ SPECIES_MANECTRIC_MEGA}}, [SPECIES_NUMEL] = {{EVO_LEVEL, 33, SPECIES_CAMERUPT}}, - [SPECIES_CAMERUPT] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_CAMERUPTITE*/ SPECIES_MEGA_CAMERUPT}}, + [SPECIES_CAMERUPT] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_CAMERUPTITE*/ SPECIES_CAMERUPT_MEGA}}, [SPECIES_SPHEAL] = {{EVO_LEVEL, 32, SPECIES_SEALEO}}, [SPECIES_SEALEO] = {{EVO_LEVEL, 44, SPECIES_WALREIN}}, [SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE}}, [SPECIES_SNORUNT] = {{EVO_LEVEL, 42, SPECIES_GLALIE}, {EVO_ITEM_FEMALE, ITEM_NONE,/*ITEM_DAWN_STONE*/ SPECIES_FROSLASS}}, - [SPECIES_GLALIE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GLALITITE*/ SPECIES_MEGA_GLALIE}}, + [SPECIES_GLALIE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GLALITITE*/ SPECIES_GLALIE_MEGA}}, [SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL}}, [SPECIES_SPOINK] = {{EVO_LEVEL, 32, SPECIES_GRUMPIG}}, - [SPECIES_MAWILE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MAWILITE*/ SPECIES_MEGA_MAWILE}}, + [SPECIES_MAWILE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MAWILITE*/ SPECIES_MAWILE_MEGA}}, [SPECIES_MEDITITE] = {{EVO_LEVEL, 37, SPECIES_MEDICHAM}}, - [SPECIES_MEDICHAM] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MEDICHAMITE*/ SPECIES_MEGA_MEDICHAM}}, + [SPECIES_MEDICHAM] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_MEDICHAMITE*/ SPECIES_MEDICHAM_MEGA}}, [SPECIES_SWABLU] = {{EVO_LEVEL, 35, SPECIES_ALTARIA}}, - [SPECIES_ALTARIA] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ALTARIANITE*/ SPECIES_MEGA_ALTARIA}}, + [SPECIES_ALTARIA] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ALTARIANITE*/ SPECIES_ALTARIA_MEGA}}, [SPECIES_WYNAUT] = {{EVO_LEVEL, 15, SPECIES_WOBBUFFET}}, [SPECIES_DUSKULL] = {{EVO_LEVEL, 37, SPECIES_DUSCLOPS}}, [SPECIES_DUSCLOPS] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_REAPER_CLOTH*/ SPECIES_DUSKNOIR}}, @@ -231,26 +231,26 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_LOUDRED] = {{EVO_LEVEL, 40, SPECIES_EXPLOUD}}, [SPECIES_CLAMPERL] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_DEEP_SEA_TOOTH*/ SPECIES_HUNTAIL}, {EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_DEEP_SEA_SCALE*/ SPECIES_GOREBYSS}}, - [SPECIES_ABSOL] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ABSOLITE*/ SPECIES_MEGA_ABSOL}}, + [SPECIES_ABSOL] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ABSOLITE*/ SPECIES_ABSOL_MEGA}}, [SPECIES_SHUPPET] = {{EVO_LEVEL, 37, SPECIES_BANETTE}}, - [SPECIES_BANETTE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_BANETTITE*/ SPECIES_MEGA_BANETTE}}, + [SPECIES_BANETTE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_BANETTITE*/ SPECIES_BANETTE_MEGA}}, [SPECIES_ARON] = {{EVO_LEVEL, 32, SPECIES_LAIRON}}, [SPECIES_LAIRON] = {{EVO_LEVEL, 42, SPECIES_AGGRON}}, - [SPECIES_AGGRON] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AGGRONITE*/ SPECIES_MEGA_AGGRON}}, + [SPECIES_AGGRON] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AGGRONITE*/ SPECIES_AGGRON_MEGA}}, [SPECIES_LILEEP] = {{EVO_LEVEL, 40, SPECIES_CRADILY}}, [SPECIES_ANORITH] = {{EVO_LEVEL, 40, SPECIES_ARMALDO}}, [SPECIES_RALTS] = {{EVO_LEVEL, 20, SPECIES_KIRLIA}}, [SPECIES_KIRLIA] = {{EVO_LEVEL, 30, SPECIES_GARDEVOIR}, {EVO_ITEM_MALE, ITEM_NONE,/*ITEM_DAWN_STONE*/ SPECIES_GALLADE}}, - [SPECIES_GARDEVOIR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GARDEVOIRITE*/ SPECIES_MEGA_GARDEVOIR}}, + [SPECIES_GARDEVOIR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GARDEVOIRITE*/ SPECIES_GARDEVOIR_MEGA}}, [SPECIES_BAGON] = {{EVO_LEVEL, 30, SPECIES_SHELGON}}, [SPECIES_SHELGON] = {{EVO_LEVEL, 50, SPECIES_SALAMENCE}}, - [SPECIES_SALAMENCE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SALAMENCITE*/ SPECIES_MEGA_SALAMENCE}}, + [SPECIES_SALAMENCE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SALAMENCITE*/ SPECIES_SALAMENCE_MEGA}}, [SPECIES_BELDUM] = {{EVO_LEVEL, 20, SPECIES_METANG}}, [SPECIES_METANG] = {{EVO_LEVEL, 45, SPECIES_METAGROSS}}, - [SPECIES_METAGROSS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_METAGROSSITE*/ SPECIES_MEGA_METAGROSS}}, - [SPECIES_LATIAS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIASITE*/ SPECIES_MEGA_LATIAS}}, - [SPECIES_LATIOS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIOSITE*/ SPECIES_MEGA_LATIOS}}, + [SPECIES_METAGROSS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_METAGROSSITE*/ SPECIES_METAGROSS_MEGA}}, + [SPECIES_LATIAS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIASITE*/ SPECIES_LATIAS_MEGA}}, + [SPECIES_LATIOS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIOSITE*/ SPECIES_LATIOS_MEGA}}, // Gens 4-7 [SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}}, @@ -276,7 +276,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SHELLOS] = {{EVO_LEVEL, 30, SPECIES_GASTRODON}}, [SPECIES_DRIFLOON] = {{EVO_LEVEL, 28, SPECIES_DRIFBLIM}}, [SPECIES_BUNEARY] = {{EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY}}, - [SPECIES_LOPUNNY] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LOPUNNITE*/ SPECIES_MEGA_LOPUNNY}}, + [SPECIES_LOPUNNY] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LOPUNNITE*/ SPECIES_LOPUNNY_MEGA}}, [SPECIES_GLAMEOW] = {{EVO_LEVEL, 38, SPECIES_PURUGLY}}, [SPECIES_CHINGLING] = {{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_CHIMECHO}}, [SPECIES_STUNKY] = {{EVO_LEVEL, 34, SPECIES_SKUNTANK}}, @@ -286,18 +286,18 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_HAPPINY] = {{EVO_ITEM_HOLD_DAY, ITEM_NONE,/*ITEM_OVAL_STONE*/ SPECIES_CHANSEY}}, [SPECIES_GIBLE] = {{EVO_LEVEL, 24, SPECIES_GABITE}}, [SPECIES_GABITE] = {{EVO_LEVEL, 48, SPECIES_GARCHOMP}}, - [SPECIES_GARCHOMP] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GARCHOMPITE*/ SPECIES_MEGA_GARCHOMP}}, + [SPECIES_GARCHOMP] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GARCHOMPITE*/ SPECIES_GARCHOMP_MEGA}}, [SPECIES_MUNCHLAX] = {{EVO_FRIENDSHIP, 0, SPECIES_SNORLAX}}, [SPECIES_RIOLU] = {{EVO_FRIENDSHIP, 0, SPECIES_LUCARIO}}, - [SPECIES_LUCARIO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LUCARIONITE*/ SPECIES_MEGA_LUCARIO}}, + [SPECIES_LUCARIO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LUCARIONITE*/ SPECIES_LUCARIO_MEGA}}, [SPECIES_HIPPOPOTAS] = {{EVO_LEVEL, 34, SPECIES_HIPPOWDON}}, [SPECIES_SKORUPI] = {{EVO_LEVEL, 40, SPECIES_DRAPION}}, [SPECIES_CROAGUNK] = {{EVO_LEVEL, 37, SPECIES_TOXICROAK}}, [SPECIES_FINNEON] = {{EVO_LEVEL, 31, SPECIES_LUMINEON}}, [SPECIES_MANTYKE] = {{EVO_SPECIFIC_MON_IN_PARTY, SPECIES_REMORAID, SPECIES_MANTINE}}, [SPECIES_SNOVER] = {{EVO_LEVEL, 40, SPECIES_ABOMASNOW}}, - [SPECIES_ABOMASNOW] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ABOMASITE*/ SPECIES_MEGA_ABOMASNOW}}, - [SPECIES_GALLADE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GALLADITE*/ SPECIES_MEGA_GALLADE}}, + [SPECIES_ABOMASNOW] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ABOMASITE*/ SPECIES_ABOMASNOW_MEGA}}, + [SPECIES_GALLADE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GALLADITE*/ SPECIES_GALLADE_MEGA}}, [SPECIES_SNIVY] = {{EVO_LEVEL, 17, SPECIES_SERVINE}}, [SPECIES_SERVINE] = {{EVO_LEVEL, 36, SPECIES_SERPERIOR}}, [SPECIES_TEPIG] = {{EVO_LEVEL, 17, SPECIES_PIGNITE}}, @@ -320,7 +320,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_BOLDORE] = {{EVO_TRADE, 0, SPECIES_GIGALITH}}, [SPECIES_WOOBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_SWOOBAT}}, [SPECIES_DRILBUR] = {{EVO_LEVEL, 31, SPECIES_EXCADRILL}}, - [SPECIES_AUDINO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AUDINITE*/ SPECIES_MEGA_AUDINO}}, + [SPECIES_AUDINO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AUDINITE*/ SPECIES_AUDINO_MEGA}}, [SPECIES_TIMBURR] = {{EVO_LEVEL, 25, SPECIES_GURDURR}}, [SPECIES_GURDURR] = {{EVO_TRADE, 0, SPECIES_CONKELDURR}}, [SPECIES_TYMPOLE] = {{EVO_LEVEL, 25, SPECIES_PALPITOAD}}, @@ -392,7 +392,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [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}, - {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_F}}, + {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}}, [SPECIES_HONEDGE] = {{EVO_LEVEL, 35, SPECIES_DOUBLADE}}, [SPECIES_DOUBLADE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_DUSK_STONE*/ SPECIES_AEGISLASH}}, [SPECIES_SPRITZEE] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_SACHET*/ SPECIES_AROMATISSE}}, @@ -410,7 +410,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PUMPKABOO] = {{EVO_TRADE, 0, SPECIES_GOURGEIST}}, [SPECIES_BERGMITE] = {{EVO_LEVEL, 37, SPECIES_AVALUGG}}, [SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN}}, - [SPECIES_DIANCIE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_DIANCITE*/ SPECIES_MEGA_DIANCIE}}, + [SPECIES_DIANCIE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_DIANCITE*/ SPECIES_DIANCIE_MEGA}}, [SPECIES_ROWLET] = {{EVO_LEVEL, 17, SPECIES_DARTRIX}}, [SPECIES_DARTRIX] = {{EVO_LEVEL, 34, SPECIES_DECIDUEYE}}, [SPECIES_LITTEN] = {{EVO_LEVEL, 17, SPECIES_TORRACAT}}, @@ -444,14 +444,14 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_COSMOEM] = {{EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}}, [SPECIES_POIPOLE] = {{EVO_MOVE, MOVE_NONE,/*MOVE_DRAGON_PULSE*/ SPECIES_NAGANADEL}}, - [SPECIES_ALOLAN_RATTATA] = {{EVO_LEVEL_NIGHT, 20, SPECIES_ALOLAN_RATICATE}}, - [SPECIES_ALOLAN_SANDSHREW] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_ALOLAN_SANDSLASH}}, - [SPECIES_ALOLAN_VULPIX] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_ALOLAN_NINETALES}}, - [SPECIES_ALOLAN_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_ALOLAN_DUGTRIO}}, - [SPECIES_ALOLAN_MEOWTH] = {{EVO_FRIENDSHIP, 28, SPECIES_ALOLAN_PERSIAN}}, - [SPECIES_ALOLAN_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_ALOLAN_GRAVELER}}, - [SPECIES_ALOLAN_GRAVELER] = {{EVO_TRADE, 0, SPECIES_ALOLAN_GOLEM}}, - [SPECIES_ALOLAN_GRIMER] = {{EVO_LEVEL, 38, SPECIES_ALOLAN_MUK}}, + [SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}}, + [SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_SANDSLASH_ALOLAN}}, + [SPECIES_VULPIX_ALOLAN] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_NINETALES_ALOLAN}}, + [SPECIES_DIGLETT_ALOLAN] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}}, + [SPECIES_MEOWTH_ALOLAN] = {{EVO_FRIENDSHIP, 28, SPECIES_PERSIAN_ALOLAN}}, + [SPECIES_GEODUDE_ALOLAN] = {{EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}}, + [SPECIES_GRAVELER_ALOLAN] = {{EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}}, + [SPECIES_GRIMER_ALOLAN] = {{EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}}, [SPECIES_BURMY_SANDY_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, [SPECIES_BURMY_TRASH_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK}, diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 489d5777b..c6817171c 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -811,76 +811,76 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MELTAN] = sMeltanLevelUpLearnset, [SPECIES_MELMETAL] = sMelmetalLevelUpLearnset, // Megas - [SPECIES_MEGA_VENUSAUR] = sVenusaurLevelUpLearnset, - [SPECIES_MEGA_CHARIZARD_X] = sCharizardLevelUpLearnset, - [SPECIES_MEGA_CHARIZARD_Y] = sCharizardLevelUpLearnset, - [SPECIES_MEGA_BLASTOISE] = sBlastoiseLevelUpLearnset, - [SPECIES_MEGA_BEEDRILL] = sBeedrillLevelUpLearnset, - [SPECIES_MEGA_PIDGEOT] = sPidgeotLevelUpLearnset, - [SPECIES_MEGA_ALAKAZAM] = sAlakazamLevelUpLearnset, - [SPECIES_MEGA_SLOWBRO] = sSlowbroLevelUpLearnset, - [SPECIES_MEGA_GENGAR] = sGengarLevelUpLearnset, - [SPECIES_MEGA_KANGASKHAN] = sKangaskhanLevelUpLearnset, - [SPECIES_MEGA_PINSIR] = sPinsirLevelUpLearnset, - [SPECIES_MEGA_GYARADOS] = sGyaradosLevelUpLearnset, - [SPECIES_MEGA_AERODACTYL] = sAerodactylLevelUpLearnset, - [SPECIES_MEGA_MEWTWO_X] = sMewtwoLevelUpLearnset, - [SPECIES_MEGA_MEWTWO_Y] = sMewtwoLevelUpLearnset, - [SPECIES_MEGA_AMPHAROS] = sAmpharosLevelUpLearnset, - [SPECIES_MEGA_STEELIX] = sSteelixLevelUpLearnset, - [SPECIES_MEGA_SCIZOR] = sScizorLevelUpLearnset, - [SPECIES_MEGA_HERACROSS] = sHeracrossLevelUpLearnset, - [SPECIES_MEGA_HOUNDOOM] = sHoundoomLevelUpLearnset, - [SPECIES_MEGA_TYRANITAR] = sTyranitarLevelUpLearnset, - [SPECIES_MEGA_SCEPTILE] = sSceptileLevelUpLearnset, - [SPECIES_MEGA_BLAZIKEN] = sBlazikenLevelUpLearnset, - [SPECIES_MEGA_SWAMPERT] = sSwampertLevelUpLearnset, - [SPECIES_MEGA_GARDEVOIR] = sGardevoirLevelUpLearnset, - [SPECIES_MEGA_SABLEYE] = sSableyeLevelUpLearnset, - [SPECIES_MEGA_MAWILE] = sMawileLevelUpLearnset, - [SPECIES_MEGA_AGGRON] = sAggronLevelUpLearnset, - [SPECIES_MEGA_MEDICHAM] = sMedichamLevelUpLearnset, - [SPECIES_MEGA_MANECTRIC] = sManectricLevelUpLearnset, - [SPECIES_MEGA_SHARPEDO] = sSharpedoLevelUpLearnset, - [SPECIES_MEGA_CAMERUPT] = sCameruptLevelUpLearnset, - [SPECIES_MEGA_ALTARIA] = sAltariaLevelUpLearnset, - [SPECIES_MEGA_BANETTE] = sBanetteLevelUpLearnset, - [SPECIES_MEGA_ABSOL] = sAbsolLevelUpLearnset, - [SPECIES_MEGA_GLALIE] = sGlalieLevelUpLearnset, - [SPECIES_MEGA_SALAMENCE] = sSalamenceLevelUpLearnset, - [SPECIES_MEGA_METAGROSS] = sMetagrossLevelUpLearnset, - [SPECIES_MEGA_LATIAS] = sLatiasLevelUpLearnset, - [SPECIES_MEGA_LATIOS] = sLatiosLevelUpLearnset, - [SPECIES_MEGA_LOPUNNY] = sLopunnyLevelUpLearnset, - [SPECIES_MEGA_GARCHOMP] = sGarchompLevelUpLearnset, - [SPECIES_MEGA_LUCARIO] = sLucarioLevelUpLearnset, - [SPECIES_MEGA_ABOMASNOW] = sAbomasnowLevelUpLearnset, - [SPECIES_MEGA_GALLADE] = sGalladeLevelUpLearnset, - [SPECIES_MEGA_AUDINO] = sAudinoLevelUpLearnset, - [SPECIES_MEGA_DIANCIE] = sDiancieLevelUpLearnset, + [SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset, + [SPECIES_CHARIZARD_MEGA_X] = sCharizardLevelUpLearnset, + [SPECIES_CHARIZARD_MEGA_Y] = sCharizardLevelUpLearnset, + [SPECIES_BLASTOISE_MEGA] = sBlastoiseLevelUpLearnset, + [SPECIES_BEEDRILL_MEGA] = sBeedrillLevelUpLearnset, + [SPECIES_PIDGEOT_MEGA] = sPidgeotLevelUpLearnset, + [SPECIES_ALAKAZAM_MEGA] = sAlakazamLevelUpLearnset, + [SPECIES_SLOWBRO_MEGA] = sSlowbroLevelUpLearnset, + [SPECIES_GENGAR_MEGA] = sGengarLevelUpLearnset, + [SPECIES_KANGASKHAN_MEGA] = sKangaskhanLevelUpLearnset, + [SPECIES_PINSIR_MEGA] = sPinsirLevelUpLearnset, + [SPECIES_GYARADOS_MEGA] = sGyaradosLevelUpLearnset, + [SPECIES_AERODACTYL_MEGA] = sAerodactylLevelUpLearnset, + [SPECIES_MEWTWO_MEGA_X] = sMewtwoLevelUpLearnset, + [SPECIES_MEWTWO_MEGA_Y] = sMewtwoLevelUpLearnset, + [SPECIES_AMPHAROS_MEGA] = sAmpharosLevelUpLearnset, + [SPECIES_STEELIX_MEGA] = sSteelixLevelUpLearnset, + [SPECIES_SCIZOR_MEGA] = sScizorLevelUpLearnset, + [SPECIES_HERACROSS_MEGA] = sHeracrossLevelUpLearnset, + [SPECIES_HOUNDOOM_MEGA] = sHoundoomLevelUpLearnset, + [SPECIES_TYRANITAR_MEGA] = sTyranitarLevelUpLearnset, + [SPECIES_SCEPTILE_MEGA] = sSceptileLevelUpLearnset, + [SPECIES_BLAZIKEN_MEGA] = sBlazikenLevelUpLearnset, + [SPECIES_SWAMPERT_MEGA] = sSwampertLevelUpLearnset, + [SPECIES_GARDEVOIR_MEGA] = sGardevoirLevelUpLearnset, + [SPECIES_SABLEYE_MEGA] = sSableyeLevelUpLearnset, + [SPECIES_MAWILE_MEGA] = sMawileLevelUpLearnset, + [SPECIES_AGGRON_MEGA] = sAggronLevelUpLearnset, + [SPECIES_MEDICHAM_MEGA] = sMedichamLevelUpLearnset, + [SPECIES_MANECTRIC_MEGA] = sManectricLevelUpLearnset, + [SPECIES_SHARPEDO_MEGA] = sSharpedoLevelUpLearnset, + [SPECIES_CAMERUPT_MEGA] = sCameruptLevelUpLearnset, + [SPECIES_ALTARIA_MEGA] = sAltariaLevelUpLearnset, + [SPECIES_BANETTE_MEGA] = sBanetteLevelUpLearnset, + [SPECIES_ABSOL_MEGA] = sAbsolLevelUpLearnset, + [SPECIES_GLALIE_MEGA] = sGlalieLevelUpLearnset, + [SPECIES_SALAMENCE_MEGA] = sSalamenceLevelUpLearnset, + [SPECIES_METAGROSS_MEGA] = sMetagrossLevelUpLearnset, + [SPECIES_LATIAS_MEGA] = sLatiasLevelUpLearnset, + [SPECIES_LATIOS_MEGA] = sLatiosLevelUpLearnset, + [SPECIES_LOPUNNY_MEGA] = sLopunnyLevelUpLearnset, + [SPECIES_GARCHOMP_MEGA] = sGarchompLevelUpLearnset, + [SPECIES_LUCARIO_MEGA] = sLucarioLevelUpLearnset, + [SPECIES_ABOMASNOW_MEGA] = sAbomasnowLevelUpLearnset, + [SPECIES_GALLADE_MEGA] = sGalladeLevelUpLearnset, + [SPECIES_AUDINO_MEGA] = sAudinoLevelUpLearnset, + [SPECIES_DIANCIE_MEGA] = sDiancieLevelUpLearnset, // Special Mega + Primals - [SPECIES_MEGA_RAYQUAZA] = sRayquazaLevelUpLearnset, - [SPECIES_PRIMAL_KYOGRE] = sKyogreLevelUpLearnset, - [SPECIES_PRIMAL_GROUDON] = sGroudonLevelUpLearnset, + [SPECIES_RAYQUAZA_MEGA] = sRayquazaLevelUpLearnset, + [SPECIES_KYOGRE_PRIMAL] = sKyogreLevelUpLearnset, + [SPECIES_GROUDON_PRIMAL] = sGroudonLevelUpLearnset, // Alolan Forms - [SPECIES_ALOLAN_RATTATA] = sAlolanRattataLevelUpLearnset, - [SPECIES_ALOLAN_RATICATE] = sAlolanRaticateLevelUpLearnset, - [SPECIES_ALOLAN_RAICHU] = sAlolanRaichuLevelUpLearnset, - [SPECIES_ALOLAN_SANDSHREW] = sAlolanSandshrewLevelUpLearnset, - [SPECIES_ALOLAN_SANDSLASH] = sAlolanSandslashLevelUpLearnset, - [SPECIES_ALOLAN_VULPIX] = sAlolanVulpixLevelUpLearnset, - [SPECIES_ALOLAN_NINETALES] = sAlolanNinetalesLevelUpLearnset, - [SPECIES_ALOLAN_DIGLETT] = sAlolanDiglettLevelUpLearnset, - [SPECIES_ALOLAN_DUGTRIO] = sAlolanDugtrioLevelUpLearnset, - [SPECIES_ALOLAN_MEOWTH] = sAlolanMeowthLevelUpLearnset, - [SPECIES_ALOLAN_PERSIAN] = sAlolanPersianLevelUpLearnset, - [SPECIES_ALOLAN_GEODUDE] = sAlolanGeodudeLevelUpLearnset, - [SPECIES_ALOLAN_GRAVELER] = sAlolanGravelerLevelUpLearnset, - [SPECIES_ALOLAN_GOLEM] = sAlolanGolemLevelUpLearnset, - [SPECIES_ALOLAN_GRIMER] = sAlolanGrimerLevelUpLearnset, - [SPECIES_ALOLAN_MUK] = sAlolanMukLevelUpLearnset, - [SPECIES_ALOLAN_EXEGGUTOR] = sAlolanExeggutorLevelUpLearnset, - [SPECIES_ALOLAN_MAROWAK] = sAlolanMarowakLevelUpLearnset, + [SPECIES_RATTATA_ALOLAN] = sRattataAlolanLevelUpLearnset, + [SPECIES_RATICATE_ALOLAN] = sRaticateAlolanLevelUpLearnset, + [SPECIES_RAICHU_ALOLAN] = sRaichuAlolanLevelUpLearnset, + [SPECIES_SANDSHREW_ALOLAN] = sSandshrewAlolanLevelUpLearnset, + [SPECIES_SANDSLASH_ALOLAN] = sSandslashAlolanLevelUpLearnset, + [SPECIES_VULPIX_ALOLAN] = sVulpixAlolanLevelUpLearnset, + [SPECIES_NINETALES_ALOLAN] = sNinetalesAlolanLevelUpLearnset, + [SPECIES_DIGLETT_ALOLAN] = sDiglettAlolanLevelUpLearnset, + [SPECIES_DUGTRIO_ALOLAN] = sDugtrioAlolanLevelUpLearnset, + [SPECIES_MEOWTH_ALOLAN] = sMeowthAlolanLevelUpLearnset, + [SPECIES_PERSIAN_ALOLAN] = sPersianAlolanLevelUpLearnset, + [SPECIES_GEODUDE_ALOLAN] = sGeodudeAlolanLevelUpLearnset, + [SPECIES_GRAVELER_ALOLAN] = sGravelerAlolanLevelUpLearnset, + [SPECIES_GOLEM_ALOLAN] = sGolemAlolanLevelUpLearnset, + [SPECIES_GRIMER_ALOLAN] = sGrimerAlolanLevelUpLearnset, + [SPECIES_MUK_ALOLAN] = sMukAlolanLevelUpLearnset, + [SPECIES_EXEGGUTOR_ALOLAN] = sExeggutorAlolanLevelUpLearnset, + [SPECIES_MAROWAK_ALOLAN] = sMarowakAlolanLevelUpLearnset, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, @@ -1053,7 +1053,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_FURFROU_KABUKI_TRIM] = sFurfrouLevelUpLearnset, [SPECIES_FURFROU_PHARAOH_TRIM] = sFurfrouLevelUpLearnset, // Meowstic - [SPECIES_MEOWSTIC_F] = sMeowsticFLevelUpLearnset, + [SPECIES_MEOWSTIC_FEMALE] = sMeowsticFemaleLevelUpLearnset, // Aegislash [SPECIES_AEGISLASH_BLADE] = sAegislashLevelUpLearnset, // Pumpkaboo diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 92da27786..1e9993068 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -16524,7 +16524,7 @@ static const struct LevelUpMove sMelmetalLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanRattataLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 3, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 6, MOVE_QUICK_ATTACK), @@ -16538,7 +16538,7 @@ static const struct LevelUpMove sAlolanRattataLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanRaticateLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), LEVEL_UP_MOVE( 1, MOVE_COUNTER), LEVEL_UP_MOVE( 1, MOVE_FURY_SWIPES), @@ -16555,7 +16555,7 @@ static const struct LevelUpMove sAlolanRaticateLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanRaichuLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), @@ -16566,7 +16566,7 @@ static const struct LevelUpMove sAlolanRaichuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanSandshrewLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_BIDE), @@ -16581,7 +16581,7 @@ static const struct LevelUpMove sAlolanSandshrewLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanSandslashLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COUNTER), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -16590,7 +16590,7 @@ static const struct LevelUpMove sAlolanSandslashLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanVulpixLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 3, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 7, MOVE_MIST), @@ -16604,7 +16604,7 @@ static const struct LevelUpMove sAlolanVulpixLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanNinetalesLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS), //LEVEL_UP_MOVE( 1, MOVE_NASTY_PLOT), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -16614,7 +16614,7 @@ static const struct LevelUpMove sAlolanNinetalesLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanDiglettLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 4, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 8, MOVE_GROWL), @@ -16628,7 +16628,7 @@ static const struct LevelUpMove sAlolanDiglettLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanDugtrioLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TRI_ATTACK), LEVEL_UP_MOVE( 1, MOVE_SCREECH), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), @@ -16644,7 +16644,7 @@ static const struct LevelUpMove sAlolanDugtrioLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanMeowthLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_BITE), @@ -16660,7 +16660,7 @@ static const struct LevelUpMove sAlolanMeowthLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanPersianLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_AMNESIA), LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS), @@ -16679,7 +16679,7 @@ static const struct LevelUpMove sAlolanPersianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanGeodudeLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_THUNDER_SHOCK), @@ -16695,7 +16695,7 @@ static const struct LevelUpMove sAlolanGeodudeLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanGravelerLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), @@ -16711,7 +16711,7 @@ static const struct LevelUpMove sAlolanGravelerLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanGolemLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MEGA_PUNCH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -16728,7 +16728,7 @@ static const struct LevelUpMove sAlolanGolemLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanGrimerLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 6, MOVE_HARDEN), @@ -16742,7 +16742,7 @@ static const struct LevelUpMove sAlolanGrimerLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanMukLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HAZE), //LEVEL_UP_MOVE( 1, MOVE_MOONBLAST), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -16758,7 +16758,7 @@ static const struct LevelUpMove sAlolanMukLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanExeggutorLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { //LEVEL_UP_MOVE( 1, MOVE_DRAGON_PULSE), //LEVEL_UP_MOVE( 1, MOVE_POWER_WHIP), LEVEL_UP_MOVE( 1, MOVE_EGG_BOMB), @@ -16769,7 +16769,7 @@ static const struct LevelUpMove sAlolanExeggutorLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sAlolanMarowakLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), LEVEL_UP_MOVE( 1, MOVE_SCREECH), LEVEL_UP_MOVE( 1, MOVE_GROWL), @@ -16962,7 +16962,7 @@ static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { //LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), //LEVEL_UP_MOVE( 1, MOVE_ME_FIRST), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index c96a5990b..939884077 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -19187,7 +19187,7 @@ const u32 gTMHMLearnsets[][2] = [SPECIES_MELMETAL] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_ALOLAN_RATTATA] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_RATTATA_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -19200,7 +19200,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_RATICATE] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_RATICATE_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM08_BULK_UP) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -19215,7 +19215,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_RAICHU] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_RAICHU_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -19233,7 +19233,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_SANDSHREW] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_SANDSHREW_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -19247,7 +19247,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_SANDSLASH] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_SANDSLASH_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -19262,7 +19262,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_VULPIX] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_VULPIX_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM13_ICE_BEAM) @@ -19272,7 +19272,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_NINETALES] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_NINETALES_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -19284,7 +19284,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_DIGLETT] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_DIGLETT_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -19294,7 +19294,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_DUGTRIO] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_DUGTRIO_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -19305,7 +19305,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_MEOWTH] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_MEOWTH_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) | TMHM(TM23_IRON_TAIL) @@ -19317,7 +19317,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_PERSIAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_PERSIAN_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) | TMHM(TM15_HYPER_BEAM) @@ -19330,7 +19330,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_GEODUDE] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GEODUDE_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) @@ -19344,7 +19344,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_GRAVELER] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GRAVELER_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -19358,7 +19358,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_GOLEM] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GOLEM_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -19373,7 +19373,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_GRIMER] = TMHM_LEARNSET(TMHM(TM28_DIG) + [SPECIES_GRIMER_ALOLAN] = TMHM_LEARNSET(TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) | TMHM(TM35_FLAMETHROWER) @@ -19385,7 +19385,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_MUK] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_MUK_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) @@ -19400,7 +19400,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_EXEGGUTOR] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_EXEGGUTOR_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) | TMHM(TM35_FLAMETHROWER) @@ -19417,7 +19417,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_ALOLAN_MAROWAK] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_MAROWAK_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) @@ -22235,7 +22235,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWSTIC_F] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MEOWSTIC_FEMALE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM28_DIG) diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h index ee3414d93..08ce1bb82 100644 --- a/src/data/pokemon/tutor_learnsets.h +++ b/src/data/pokemon/tutor_learnsets.h @@ -9582,7 +9582,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_MEOWSTIC_F] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_MEOWSTIC_FEMALE] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_PSYCH_UP) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index a43a0cd48..be2c11ea6 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -4051,344 +4051,344 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 13, }, // Megas - [SPECIES_MEGA_VENUSAUR] = + [SPECIES_VENUSAUR_MEGA] = { .size = 0, .y_offset = 10, }, - [SPECIES_MEGA_CHARIZARD_X] = + [SPECIES_CHARIZARD_MEGA_X] = { .size = 0, .y_offset = 2, }, - [SPECIES_MEGA_CHARIZARD_Y] = + [SPECIES_CHARIZARD_MEGA_Y] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_BLASTOISE] = + [SPECIES_BLASTOISE_MEGA] = { .size = 0, .y_offset = 3, }, - [SPECIES_MEGA_BEEDRILL] = + [SPECIES_BEEDRILL_MEGA] = { .size = 0, .y_offset = 5, }, - [SPECIES_MEGA_PIDGEOT] = + [SPECIES_PIDGEOT_MEGA] = { .size = 0, .y_offset = 7, }, - [SPECIES_MEGA_ALAKAZAM] = + [SPECIES_ALAKAZAM_MEGA] = { .size = 0, .y_offset = 8, }, - [SPECIES_MEGA_SLOWBRO] = + [SPECIES_SLOWBRO_MEGA] = { .size = 0, .y_offset = 9, }, - [SPECIES_MEGA_GENGAR] = + [SPECIES_GENGAR_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_KANGASKHAN] = + [SPECIES_KANGASKHAN_MEGA] = { .size = 0, .y_offset = 6, }, - [SPECIES_MEGA_PINSIR] = + [SPECIES_PINSIR_MEGA] = { .size = 0, .y_offset = 7, }, - [SPECIES_MEGA_GYARADOS] = + [SPECIES_GYARADOS_MEGA] = { .size = 0, .y_offset = 3, }, - [SPECIES_MEGA_AERODACTYL] = + [SPECIES_AERODACTYL_MEGA] = { .size = 0, .y_offset = 8, }, - [SPECIES_MEGA_MEWTWO_X] = + [SPECIES_MEWTWO_MEGA_X] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_MEWTWO_Y] = + [SPECIES_MEWTWO_MEGA_Y] = { .size = 0, .y_offset = 2, }, - [SPECIES_MEGA_AMPHAROS] = + [SPECIES_AMPHAROS_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_STEELIX] = + [SPECIES_STEELIX_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_SCIZOR] = + [SPECIES_SCIZOR_MEGA] = { .size = 0, .y_offset = 4, }, - [SPECIES_MEGA_HERACROSS] = + [SPECIES_HERACROSS_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_HOUNDOOM] = + [SPECIES_HOUNDOOM_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_TYRANITAR] = + [SPECIES_TYRANITAR_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_SCEPTILE] = + [SPECIES_SCEPTILE_MEGA] = { .size = 0, .y_offset = 3, }, - [SPECIES_MEGA_BLAZIKEN] = + [SPECIES_BLAZIKEN_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_SWAMPERT] = + [SPECIES_SWAMPERT_MEGA] = { .size = 0, .y_offset = 6, }, - [SPECIES_MEGA_GARDEVOIR] = + [SPECIES_GARDEVOIR_MEGA] = { .size = 0, .y_offset = 6, }, - [SPECIES_MEGA_SABLEYE] = + [SPECIES_SABLEYE_MEGA] = { .size = 0, .y_offset = 13, }, - [SPECIES_MEGA_MAWILE] = + [SPECIES_MAWILE_MEGA] = { .size = 0, .y_offset = 6, }, - [SPECIES_MEGA_AGGRON] = + [SPECIES_AGGRON_MEGA] = { .size = 0, .y_offset = 7, }, - [SPECIES_MEGA_MEDICHAM] = + [SPECIES_MEDICHAM_MEGA] = { .size = 0, .y_offset = 2, }, - [SPECIES_MEGA_MANECTRIC] = + [SPECIES_MANECTRIC_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_SHARPEDO] = + [SPECIES_SHARPEDO_MEGA] = { .size = 0, .y_offset = 3, }, - [SPECIES_MEGA_CAMERUPT] = + [SPECIES_CAMERUPT_MEGA] = { .size = 0, .y_offset = 9, }, - [SPECIES_MEGA_ALTARIA] = + [SPECIES_ALTARIA_MEGA] = { .size = 0, .y_offset = 10, }, - [SPECIES_MEGA_BANETTE] = + [SPECIES_BANETTE_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_ABSOL] = + [SPECIES_ABSOL_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_GLALIE] = + [SPECIES_GLALIE_MEGA] = { .size = 0, .y_offset = 10, }, - [SPECIES_MEGA_SALAMENCE] = + [SPECIES_SALAMENCE_MEGA] = { .size = 0, .y_offset = 4, }, - [SPECIES_MEGA_METAGROSS] = + [SPECIES_METAGROSS_MEGA] = { .size = 0, .y_offset = 6, }, - [SPECIES_MEGA_LATIAS] = + [SPECIES_LATIAS_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_LATIOS] = + [SPECIES_LATIOS_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_LOPUNNY] = + [SPECIES_LOPUNNY_MEGA] = { .size = 0, .y_offset = 4, }, - [SPECIES_MEGA_GARCHOMP] = + [SPECIES_GARCHOMP_MEGA] = { .size = 0, .y_offset = 4, }, - [SPECIES_MEGA_LUCARIO] = + [SPECIES_LUCARIO_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_ABOMASNOW] = + [SPECIES_ABOMASNOW_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_GALLADE] = + [SPECIES_GALLADE_MEGA] = { .size = 0, .y_offset = 3, }, - [SPECIES_MEGA_AUDINO] = + [SPECIES_AUDINO_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_DIANCIE] = + [SPECIES_DIANCIE_MEGA] = { .size = 0, .y_offset = 6, }, // Special Mega + Primals - [SPECIES_MEGA_RAYQUAZA] = + [SPECIES_RAYQUAZA_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_PRIMAL_KYOGRE] = + [SPECIES_KYOGRE_PRIMAL] = { .size = 0x84, .y_offset = 18, }, - [SPECIES_PRIMAL_GROUDON] = + [SPECIES_GROUDON_PRIMAL] = { .size = 0x86, .y_offset = 8, }, // Alolan Forms - [SPECIES_ALOLAN_RATTATA] = + [SPECIES_RATTATA_ALOLAN] = { .size = 0x65, .y_offset = 7, }, - [SPECIES_ALOLAN_RATICATE] = + [SPECIES_RATICATE_ALOLAN] = { .size = 0x75, .y_offset = 10, }, - [SPECIES_ALOLAN_RAICHU] = + [SPECIES_RAICHU_ALOLAN] = { .size = 0x66, .y_offset = 6, }, - [SPECIES_ALOLAN_SANDSHREW] = + [SPECIES_SANDSHREW_ALOLAN] = { .size = 0x65, .y_offset = 13, }, - [SPECIES_ALOLAN_SANDSLASH] = + [SPECIES_SANDSLASH_ALOLAN] = { .size = 0x86, .y_offset = 11, }, - [SPECIES_ALOLAN_VULPIX] = + [SPECIES_VULPIX_ALOLAN] = { .size = 0x76, .y_offset = 9, }, - [SPECIES_ALOLAN_NINETALES] = + [SPECIES_NINETALES_ALOLAN] = { .size = 0x77, .y_offset = 5, }, - [SPECIES_ALOLAN_DIGLETT] = + [SPECIES_DIGLETT_ALOLAN] = { .size = 0x54, .y_offset = 14, }, - [SPECIES_ALOLAN_DUGTRIO] = + [SPECIES_DUGTRIO_ALOLAN] = { .size = 0x66, .y_offset = 17, }, - [SPECIES_ALOLAN_MEOWTH] = + [SPECIES_MEOWTH_ALOLAN] = { .size = 0x65, .y_offset = 7, }, - [SPECIES_ALOLAN_PERSIAN] = + [SPECIES_PERSIAN_ALOLAN] = { .size = 0x87, .y_offset = 8, }, - [SPECIES_ALOLAN_GEODUDE] = + [SPECIES_GEODUDE_ALOLAN] = { .size = 0x66, .y_offset = 13, }, - [SPECIES_ALOLAN_GRAVELER] = + [SPECIES_GRAVELER_ALOLAN] = { .size = 0x75, .y_offset = 10, }, - [SPECIES_ALOLAN_GOLEM] = + [SPECIES_GOLEM_ALOLAN] = { .size = 0x84, .y_offset = 13, }, - [SPECIES_ALOLAN_GRIMER] = + [SPECIES_GRIMER_ALOLAN] = { .size = 0x75, .y_offset = 14, }, - [SPECIES_ALOLAN_MUK] = + [SPECIES_MUK_ALOLAN] = { .size = 0x87, .y_offset = 9, }, - [SPECIES_ALOLAN_EXEGGUTOR] = + [SPECIES_EXEGGUTOR_ALOLAN] = { .size = 0x87, .y_offset = 8, }, - [SPECIES_ALOLAN_MAROWAK] = + [SPECIES_MAROWAK_ALOLAN] = { .size = 0x66, .y_offset = 8, @@ -5125,7 +5125,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 0, }, // Meowstic - [SPECIES_MEOWSTIC_F] = + [SPECIES_MEOWSTIC_FEMALE] = { .size = 0x88, .y_offset = 9, diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 1fcf52044..6ec9c1480 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -104,20 +104,20 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_CUTIEFLY] = 10, [SPECIES_MINIOR] = 17, // Megas - [SPECIES_MEGA_LATIAS] = 8, - [SPECIES_MEGA_LATIOS] = 8, - [SPECIES_MEGA_METAGROSS] = 4, - [SPECIES_MEGA_GLALIE] = 8, - [SPECIES_MEGA_ALTARIA] = 6, - [SPECIES_MEGA_SHARPEDO] = 1, - [SPECIES_MEGA_PIDGEOT] = 8, - [SPECIES_MEGA_BEEDRILL] = 5, - [SPECIES_MEGA_BANETTE] = 5, - [SPECIES_MEGA_MEWTWO_Y] = 3, - [SPECIES_MEGA_AERODACTYL] = 3, - [SPECIES_MEGA_GYARADOS] = 6, - [SPECIES_MEGA_PINSIR] = 4, - [SPECIES_MEGA_ALAKAZAM] = 7, + [SPECIES_LATIAS_MEGA] = 8, + [SPECIES_LATIOS_MEGA] = 8, + [SPECIES_METAGROSS_MEGA] = 4, + [SPECIES_GLALIE_MEGA] = 8, + [SPECIES_ALTARIA_MEGA] = 6, + [SPECIES_SHARPEDO_MEGA] = 1, + [SPECIES_PIDGEOT_MEGA] = 8, + [SPECIES_BEEDRILL_MEGA] = 5, + [SPECIES_BANETTE_MEGA] = 5, + [SPECIES_MEWTWO_MEGA_Y] = 3, + [SPECIES_AERODACTYL_MEGA] = 3, + [SPECIES_GYARADOS_MEGA] = 6, + [SPECIES_PINSIR_MEGA] = 4, + [SPECIES_ALAKAZAM_MEGA] = 7, // Forms [SPECIES_GIRATINA_ORIGIN] = 7, [SPECIES_THUNDURUS_THERIAN] = 7, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 8b2a3a377..191e38147 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -4052,344 +4052,344 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 4, }, // Megas - [SPECIES_MEGA_VENUSAUR] = + [SPECIES_VENUSAUR_MEGA] = { .size = 0, .y_offset = 6, }, - [SPECIES_MEGA_CHARIZARD_X] = + [SPECIES_CHARIZARD_MEGA_X] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_CHARIZARD_Y] = + [SPECIES_CHARIZARD_MEGA_Y] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_BLASTOISE] = + [SPECIES_BLASTOISE_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_BEEDRILL] = + [SPECIES_BEEDRILL_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_PIDGEOT] = + [SPECIES_PIDGEOT_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_ALAKAZAM] = + [SPECIES_ALAKAZAM_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_SLOWBRO] = + [SPECIES_SLOWBRO_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_GENGAR] = + [SPECIES_GENGAR_MEGA] = { .size = 0, .y_offset = 8, }, - [SPECIES_MEGA_KANGASKHAN] = + [SPECIES_KANGASKHAN_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_PINSIR] = + [SPECIES_PINSIR_MEGA] = { .size = 0, .y_offset = 4, }, - [SPECIES_MEGA_GYARADOS] = + [SPECIES_GYARADOS_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_AERODACTYL] = + [SPECIES_AERODACTYL_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_MEWTWO_X] = + [SPECIES_MEWTWO_MEGA_X] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_MEWTWO_Y] = + [SPECIES_MEWTWO_MEGA_Y] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_AMPHAROS] = + [SPECIES_AMPHAROS_MEGA] = { .size = 0, .y_offset = 2, }, - [SPECIES_MEGA_STEELIX] = + [SPECIES_STEELIX_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_SCIZOR] = + [SPECIES_SCIZOR_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_HERACROSS] = + [SPECIES_HERACROSS_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_HOUNDOOM] = + [SPECIES_HOUNDOOM_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_TYRANITAR] = + [SPECIES_TYRANITAR_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_SCEPTILE] = + [SPECIES_SCEPTILE_MEGA] = { .size = 0, .y_offset = 2, }, - [SPECIES_MEGA_BLAZIKEN] = + [SPECIES_BLAZIKEN_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_SWAMPERT] = + [SPECIES_SWAMPERT_MEGA] = { .size = 0, .y_offset = 4, }, - [SPECIES_MEGA_GARDEVOIR] = + [SPECIES_GARDEVOIR_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_SABLEYE] = + [SPECIES_SABLEYE_MEGA] = { .size = 0, .y_offset = 7, }, - [SPECIES_MEGA_MAWILE] = + [SPECIES_MAWILE_MEGA] = { .size = 0, .y_offset = 5, }, - [SPECIES_MEGA_AGGRON] = + [SPECIES_AGGRON_MEGA] = { .size = 0, .y_offset = 2, }, - [SPECIES_MEGA_MEDICHAM] = + [SPECIES_MEDICHAM_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_MANECTRIC] = + [SPECIES_MANECTRIC_MEGA] = { .size = 0, .y_offset = 3, }, - [SPECIES_MEGA_SHARPEDO] = + [SPECIES_SHARPEDO_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_CAMERUPT] = + [SPECIES_CAMERUPT_MEGA] = { .size = 0, .y_offset = 6, }, - [SPECIES_MEGA_ALTARIA] = + [SPECIES_ALTARIA_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_BANETTE] = + [SPECIES_BANETTE_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_ABSOL] = + [SPECIES_ABSOL_MEGA] = { .size = 0, .y_offset = 5, }, - [SPECIES_MEGA_GLALIE] = + [SPECIES_GLALIE_MEGA] = { .size = 0, .y_offset = 4, }, - [SPECIES_MEGA_SALAMENCE] = + [SPECIES_SALAMENCE_MEGA] = { .size = 0, .y_offset = 5, }, - [SPECIES_MEGA_METAGROSS] = + [SPECIES_METAGROSS_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_LATIAS] = + [SPECIES_LATIAS_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_LATIOS] = + [SPECIES_LATIOS_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_LOPUNNY] = + [SPECIES_LOPUNNY_MEGA] = { .size = 0, .y_offset = 2, }, - [SPECIES_MEGA_GARCHOMP] = + [SPECIES_GARCHOMP_MEGA] = { .size = 0, .y_offset = 3, }, - [SPECIES_MEGA_LUCARIO] = + [SPECIES_LUCARIO_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_ABOMASNOW] = + [SPECIES_ABOMASNOW_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_MEGA_GALLADE] = + [SPECIES_GALLADE_MEGA] = { .size = 0, .y_offset = 1, }, - [SPECIES_MEGA_AUDINO] = + [SPECIES_AUDINO_MEGA] = { .size = 0, .y_offset = 5, }, - [SPECIES_MEGA_DIANCIE] = + [SPECIES_DIANCIE_MEGA] = { .size = 0, .y_offset = 0, }, // Special Mega + Primals - [SPECIES_MEGA_RAYQUAZA] = + [SPECIES_RAYQUAZA_MEGA] = { .size = 0, .y_offset = 0, }, - [SPECIES_PRIMAL_KYOGRE] = + [SPECIES_KYOGRE_PRIMAL] = { .size = 0x87, .y_offset = 0, }, - [SPECIES_PRIMAL_GROUDON] = + [SPECIES_GROUDON_PRIMAL] = { .size = 0x88, .y_offset = 0, }, // Alolan Forms - [SPECIES_ALOLAN_RATTATA] = + [SPECIES_RATTATA_ALOLAN] = { .size = 0x44, .y_offset = 13, }, - [SPECIES_ALOLAN_RATICATE] = + [SPECIES_RATICATE_ALOLAN] = { .size = 0x66, .y_offset = 6, }, - [SPECIES_ALOLAN_RAICHU] = + [SPECIES_RAICHU_ALOLAN] = { .size = 0x67, .y_offset = 3, }, - [SPECIES_ALOLAN_SANDSHREW] = + [SPECIES_SANDSHREW_ALOLAN] = { .size = 0x55, .y_offset = 11, }, - [SPECIES_ALOLAN_SANDSLASH] = + [SPECIES_SANDSLASH_ALOLAN] = { .size = 0x76, .y_offset = 6, }, - [SPECIES_ALOLAN_VULPIX] = + [SPECIES_VULPIX_ALOLAN] = { .size = 0x65, .y_offset = 11, }, - [SPECIES_ALOLAN_NINETALES] = + [SPECIES_NINETALES_ALOLAN] = { .size = 0x88, .y_offset = 3, }, - [SPECIES_ALOLAN_DIGLETT] = + [SPECIES_DIGLETT_ALOLAN] = { .size = 0x54, .y_offset = 17, }, - [SPECIES_ALOLAN_DUGTRIO] = + [SPECIES_DUGTRIO_ALOLAN] = { .size = 0x75, .y_offset = 11, }, - [SPECIES_ALOLAN_MEOWTH] = + [SPECIES_MEOWTH_ALOLAN] = { .size = 0x55, .y_offset = 10, }, - [SPECIES_ALOLAN_PERSIAN] = + [SPECIES_PERSIAN_ALOLAN] = { .size = 0x77, .y_offset = 4, }, - [SPECIES_ALOLAN_GEODUDE] = + [SPECIES_GEODUDE_ALOLAN] = { .size = 0x54, .y_offset = 19, }, - [SPECIES_ALOLAN_GRAVELER] = + [SPECIES_GRAVELER_ALOLAN] = { .size = 0x87, .y_offset = 9, }, - [SPECIES_ALOLAN_GOLEM] = + [SPECIES_GOLEM_ALOLAN] = { .size = 0x77, .y_offset = 6, }, - [SPECIES_ALOLAN_GRIMER] = + [SPECIES_GRIMER_ALOLAN] = { .size = 0x65, .y_offset = 9, }, - [SPECIES_ALOLAN_MUK] = + [SPECIES_MUK_ALOLAN] = { .size = 0x87, .y_offset = 7, }, - [SPECIES_ALOLAN_EXEGGUTOR] = + [SPECIES_EXEGGUTOR_ALOLAN] = { .size = 0x88, .y_offset = 0, }, - [SPECIES_ALOLAN_MAROWAK] = + [SPECIES_MAROWAK_ALOLAN] = { .size = 0x76, .y_offset = 8, @@ -5126,7 +5126,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 3, }, // Meowstic - [SPECIES_MEOWSTIC_F] = + [SPECIES_MEOWSTIC_FEMALE] = { .size = 0x45, .y_offset = 6, diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 2d62f2fac..f6b0c92f2 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -811,77 +811,77 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MELMETAL] = _("Melmetal"), // Megas - [SPECIES_MEGA_VENUSAUR] = _("Venusaur"), - [SPECIES_MEGA_CHARIZARD_X] = _("Charizard"), - [SPECIES_MEGA_CHARIZARD_Y] = _("Charizard"), - [SPECIES_MEGA_BLASTOISE] = _("Blastoise"), - [SPECIES_MEGA_BEEDRILL] = _("Beedrill"), - [SPECIES_MEGA_PIDGEOT] = _("Pidgeot"), - [SPECIES_MEGA_ALAKAZAM] = _("Alakazam"), - [SPECIES_MEGA_SLOWBRO] = _("Slowbro"), - [SPECIES_MEGA_GENGAR] = _("Gengar"), - [SPECIES_MEGA_KANGASKHAN] = _("Kangaskhan"), - [SPECIES_MEGA_PINSIR] = _("Pinsir"), - [SPECIES_MEGA_GYARADOS] = _("Gyarados"), - [SPECIES_MEGA_AERODACTYL] = _("Aerodactyl"), - [SPECIES_MEGA_MEWTWO_X] = _("Mewtwo"), - [SPECIES_MEGA_MEWTWO_Y] = _("Mewtwo"), - [SPECIES_MEGA_AMPHAROS] = _("Ampharos"), - [SPECIES_MEGA_STEELIX] = _("Steelix"), - [SPECIES_MEGA_SCIZOR] = _("Scizor"), - [SPECIES_MEGA_HERACROSS] = _("Heracross"), - [SPECIES_MEGA_HOUNDOOM] = _("Houndoom"), - [SPECIES_MEGA_TYRANITAR] = _("Tyranitar"), - [SPECIES_MEGA_SCEPTILE] = _("Sceptile"), - [SPECIES_MEGA_BLAZIKEN] = _("Blaziken"), - [SPECIES_MEGA_SWAMPERT] = _("Swampert"), - [SPECIES_MEGA_GARDEVOIR] = _("Gardevoir"), - [SPECIES_MEGA_SABLEYE] = _("Sableye"), - [SPECIES_MEGA_MAWILE] = _("Mawile"), - [SPECIES_MEGA_AGGRON] = _("Aggron"), - [SPECIES_MEGA_MEDICHAM] = _("Medicham"), - [SPECIES_MEGA_MANECTRIC] = _("Manectric"), - [SPECIES_MEGA_SHARPEDO] = _("Sharpedo"), - [SPECIES_MEGA_CAMERUPT] = _("Camerupt"), - [SPECIES_MEGA_ALTARIA] = _("Altaria"), - [SPECIES_MEGA_BANETTE] = _("Banette"), - [SPECIES_MEGA_ABSOL] = _("Absol"), - [SPECIES_MEGA_GLALIE] = _("Glalie"), - [SPECIES_MEGA_SALAMENCE] = _("Salamence"), - [SPECIES_MEGA_METAGROSS] = _("Metagross"), - [SPECIES_MEGA_LATIAS] = _("Latias"), - [SPECIES_MEGA_LATIOS] = _("Latios"), - [SPECIES_MEGA_LOPUNNY] = _("Lopunny"), - [SPECIES_MEGA_GARCHOMP] = _("Garchomp"), - [SPECIES_MEGA_LUCARIO] = _("Lucario"), - [SPECIES_MEGA_ABOMASNOW] = _("Abomasnow"), - [SPECIES_MEGA_GALLADE] = _("Gallade"), - [SPECIES_MEGA_AUDINO] = _("Audino"), - [SPECIES_MEGA_DIANCIE] = _("Diancie"), + [SPECIES_VENUSAUR_MEGA] = _("Venusaur"), + [SPECIES_CHARIZARD_MEGA_X] = _("Charizard"), + [SPECIES_CHARIZARD_MEGA_Y] = _("Charizard"), + [SPECIES_BLASTOISE_MEGA] = _("Blastoise"), + [SPECIES_BEEDRILL_MEGA] = _("Beedrill"), + [SPECIES_PIDGEOT_MEGA] = _("Pidgeot"), + [SPECIES_ALAKAZAM_MEGA] = _("Alakazam"), + [SPECIES_SLOWBRO_MEGA] = _("Slowbro"), + [SPECIES_GENGAR_MEGA] = _("Gengar"), + [SPECIES_KANGASKHAN_MEGA] = _("Kangaskhan"), + [SPECIES_PINSIR_MEGA] = _("Pinsir"), + [SPECIES_GYARADOS_MEGA] = _("Gyarados"), + [SPECIES_AERODACTYL_MEGA] = _("Aerodactyl"), + [SPECIES_MEWTWO_MEGA_X] = _("Mewtwo"), + [SPECIES_MEWTWO_MEGA_Y] = _("Mewtwo"), + [SPECIES_AMPHAROS_MEGA] = _("Ampharos"), + [SPECIES_STEELIX_MEGA] = _("Steelix"), + [SPECIES_SCIZOR_MEGA] = _("Scizor"), + [SPECIES_HERACROSS_MEGA] = _("Heracross"), + [SPECIES_HOUNDOOM_MEGA] = _("Houndoom"), + [SPECIES_TYRANITAR_MEGA] = _("Tyranitar"), + [SPECIES_SCEPTILE_MEGA] = _("Sceptile"), + [SPECIES_BLAZIKEN_MEGA] = _("Blaziken"), + [SPECIES_SWAMPERT_MEGA] = _("Swampert"), + [SPECIES_GARDEVOIR_MEGA] = _("Gardevoir"), + [SPECIES_SABLEYE_MEGA] = _("Sableye"), + [SPECIES_MAWILE_MEGA] = _("Mawile"), + [SPECIES_AGGRON_MEGA] = _("Aggron"), + [SPECIES_MEDICHAM_MEGA] = _("Medicham"), + [SPECIES_MANECTRIC_MEGA] = _("Manectric"), + [SPECIES_SHARPEDO_MEGA] = _("Sharpedo"), + [SPECIES_CAMERUPT_MEGA] = _("Camerupt"), + [SPECIES_ALTARIA_MEGA] = _("Altaria"), + [SPECIES_BANETTE_MEGA] = _("Banette"), + [SPECIES_ABSOL_MEGA] = _("Absol"), + [SPECIES_GLALIE_MEGA] = _("Glalie"), + [SPECIES_SALAMENCE_MEGA] = _("Salamence"), + [SPECIES_METAGROSS_MEGA] = _("Metagross"), + [SPECIES_LATIAS_MEGA] = _("Latias"), + [SPECIES_LATIOS_MEGA] = _("Latios"), + [SPECIES_LOPUNNY_MEGA] = _("Lopunny"), + [SPECIES_GARCHOMP_MEGA] = _("Garchomp"), + [SPECIES_LUCARIO_MEGA] = _("Lucario"), + [SPECIES_ABOMASNOW_MEGA] = _("Abomasnow"), + [SPECIES_GALLADE_MEGA] = _("Gallade"), + [SPECIES_AUDINO_MEGA] = _("Audino"), + [SPECIES_DIANCIE_MEGA] = _("Diancie"), // Special Mega + Primals - [SPECIES_MEGA_RAYQUAZA] = _("Rayquaza"), - [SPECIES_PRIMAL_KYOGRE] = _("Kyogre"), - [SPECIES_PRIMAL_GROUDON] = _("Groudon"), + [SPECIES_RAYQUAZA_MEGA] = _("Rayquaza"), + [SPECIES_KYOGRE_PRIMAL] = _("Kyogre"), + [SPECIES_GROUDON_PRIMAL] = _("Groudon"), // Alolan Forms - [SPECIES_ALOLAN_RATTATA] = _("Rattata"), - [SPECIES_ALOLAN_RATICATE] = _("Raticate"), - [SPECIES_ALOLAN_RAICHU] = _("Raichu"), - [SPECIES_ALOLAN_SANDSHREW] = _("Sandshrew"), - [SPECIES_ALOLAN_SANDSLASH] = _("Sandslash"), - [SPECIES_ALOLAN_VULPIX] = _("Vulpix"), - [SPECIES_ALOLAN_NINETALES] = _("Ninetales"), - [SPECIES_ALOLAN_DIGLETT] = _("Diglett"), - [SPECIES_ALOLAN_DUGTRIO] = _("Dugtrio"), - [SPECIES_ALOLAN_MEOWTH] = _("Meowth"), - [SPECIES_ALOLAN_PERSIAN] = _("Persian"), - [SPECIES_ALOLAN_GEODUDE] = _("Geodude"), - [SPECIES_ALOLAN_GRAVELER] = _("Graveler"), - [SPECIES_ALOLAN_GOLEM] = _("Golem"), - [SPECIES_ALOLAN_GRIMER] = _("Grimer"), - [SPECIES_ALOLAN_MUK] = _("Muk"), - [SPECIES_ALOLAN_EXEGGUTOR] = _("Exeggutor"), - [SPECIES_ALOLAN_MAROWAK] = _("Marowak"), + [SPECIES_RATTATA_ALOLAN] = _("Rattata"), + [SPECIES_RATICATE_ALOLAN] = _("Raticate"), + [SPECIES_RAICHU_ALOLAN] = _("Raichu"), + [SPECIES_SANDSHREW_ALOLAN] = _("Sandshrew"), + [SPECIES_SANDSLASH_ALOLAN] = _("Sandslash"), + [SPECIES_VULPIX_ALOLAN] = _("Vulpix"), + [SPECIES_NINETALES_ALOLAN] = _("Ninetales"), + [SPECIES_DIGLETT_ALOLAN] = _("Diglett"), + [SPECIES_DUGTRIO_ALOLAN] = _("Dugtrio"), + [SPECIES_MEOWTH_ALOLAN] = _("Meowth"), + [SPECIES_PERSIAN_ALOLAN] = _("Persian"), + [SPECIES_GEODUDE_ALOLAN] = _("Geodude"), + [SPECIES_GRAVELER_ALOLAN] = _("Graveler"), + [SPECIES_GOLEM_ALOLAN] = _("Golem"), + [SPECIES_GRIMER_ALOLAN] = _("Grimer"), + [SPECIES_MUK_ALOLAN] = _("Muk"), + [SPECIES_EXEGGUTOR_ALOLAN] = _("Exeggutor"), + [SPECIES_MAROWAK_ALOLAN] = _("Marowak"), // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), [SPECIES_PIKACHU_ROCK_STAR] = _("Pikachu"), @@ -1053,7 +1053,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_FURFROU_KABUKI_TRIM] = _("Furfrou"), [SPECIES_FURFROU_PHARAOH_TRIM] = _("Furfrou"), // Meowstic - [SPECIES_MEOWSTIC_F] = _("Meowstic"), + [SPECIES_MEOWSTIC_FEMALE] = _("Meowstic"), // Aegislash [SPECIES_AEGISLASH_BLADE] = _("Aegislash"), // Pumpkaboo diff --git a/src/pokemon.c b/src/pokemon.c index 30d1524b5..141f8cc7b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1124,74 +1124,74 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(MELMETAL), // Megas - [SPECIES_MEGA_VENUSAUR - 1] = NATIONAL_DEX_VENUSAUR, - [SPECIES_MEGA_CHARIZARD_X - 1] = NATIONAL_DEX_CHARIZARD, - [SPECIES_MEGA_CHARIZARD_Y - 1] = NATIONAL_DEX_CHARIZARD, - [SPECIES_MEGA_BLASTOISE - 1] = NATIONAL_DEX_BLASTOISE, - [SPECIES_MEGA_BEEDRILL - 1] = NATIONAL_DEX_BEEDRILL, - [SPECIES_MEGA_PIDGEOT - 1] = NATIONAL_DEX_PIDGEOT, - [SPECIES_MEGA_ALAKAZAM - 1] = NATIONAL_DEX_ALAKAZAM, - [SPECIES_MEGA_SLOWBRO - 1] = NATIONAL_DEX_SLOWBRO, - [SPECIES_MEGA_GENGAR - 1] = NATIONAL_DEX_GENGAR, - [SPECIES_MEGA_KANGASKHAN - 1] = NATIONAL_DEX_KANGASKHAN, - [SPECIES_MEGA_PINSIR - 1] = NATIONAL_DEX_PINSIR, - [SPECIES_MEGA_GYARADOS - 1] = NATIONAL_DEX_GYARADOS, - [SPECIES_MEGA_AERODACTYL - 1] = NATIONAL_DEX_AERODACTYL, - [SPECIES_MEGA_MEWTWO_X - 1] = NATIONAL_DEX_MEWTWO, - [SPECIES_MEGA_MEWTWO_Y - 1] = NATIONAL_DEX_MEWTWO, - [SPECIES_MEGA_AMPHAROS - 1] = NATIONAL_DEX_AMPHAROS, - [SPECIES_MEGA_STEELIX - 1] = NATIONAL_DEX_STEELIX, - [SPECIES_MEGA_SCIZOR - 1] = NATIONAL_DEX_SCIZOR, - [SPECIES_MEGA_HERACROSS - 1] = NATIONAL_DEX_HERACROSS, - [SPECIES_MEGA_HOUNDOOM - 1] = NATIONAL_DEX_HOUNDOOM, - [SPECIES_MEGA_TYRANITAR - 1] = NATIONAL_DEX_TYRANITAR, - [SPECIES_MEGA_SCEPTILE - 1] = NATIONAL_DEX_SCEPTILE, - [SPECIES_MEGA_BLAZIKEN - 1] = NATIONAL_DEX_BLAZIKEN, - [SPECIES_MEGA_SWAMPERT - 1] = NATIONAL_DEX_SWAMPERT, - [SPECIES_MEGA_GARDEVOIR - 1] = NATIONAL_DEX_GARDEVOIR, - [SPECIES_MEGA_SABLEYE - 1] = NATIONAL_DEX_SABLEYE, - [SPECIES_MEGA_MAWILE - 1] = NATIONAL_DEX_MAWILE, - [SPECIES_MEGA_AGGRON - 1] = NATIONAL_DEX_AGGRON, - [SPECIES_MEGA_MEDICHAM - 1] = NATIONAL_DEX_MEDICHAM, - [SPECIES_MEGA_MANECTRIC - 1] = NATIONAL_DEX_MANECTRIC, - [SPECIES_MEGA_SHARPEDO - 1] = NATIONAL_DEX_SHARPEDO, - [SPECIES_MEGA_CAMERUPT - 1] = NATIONAL_DEX_CAMERUPT, - [SPECIES_MEGA_ALTARIA - 1] = NATIONAL_DEX_ALTARIA, - [SPECIES_MEGA_BANETTE - 1] = NATIONAL_DEX_BANETTE, - [SPECIES_MEGA_ABSOL - 1] = NATIONAL_DEX_ABSOL, - [SPECIES_MEGA_GLALIE - 1] = NATIONAL_DEX_GLALIE, - [SPECIES_MEGA_SALAMENCE - 1] = NATIONAL_DEX_SALAMENCE, - [SPECIES_MEGA_METAGROSS - 1] = NATIONAL_DEX_METAGROSS, - [SPECIES_MEGA_LATIAS - 1] = NATIONAL_DEX_LATIAS, - [SPECIES_MEGA_LATIOS - 1] = NATIONAL_DEX_LATIOS, - [SPECIES_MEGA_LOPUNNY - 1] = NATIONAL_DEX_LOPUNNY, - [SPECIES_MEGA_GARCHOMP - 1] = NATIONAL_DEX_GARCHOMP, - [SPECIES_MEGA_LUCARIO - 1] = NATIONAL_DEX_LUCARIO, - [SPECIES_MEGA_ABOMASNOW - 1] = NATIONAL_DEX_ABOMASNOW, - [SPECIES_MEGA_GALLADE - 1] = NATIONAL_DEX_GALLADE, - [SPECIES_MEGA_AUDINO - 1] = NATIONAL_DEX_AUDINO, - [SPECIES_MEGA_DIANCIE - 1] = NATIONAL_DEX_DIANCIE, + [SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR, + [SPECIES_CHARIZARD_MEGA_X - 1] = NATIONAL_DEX_CHARIZARD, + [SPECIES_CHARIZARD_MEGA_Y - 1] = NATIONAL_DEX_CHARIZARD, + [SPECIES_BLASTOISE_MEGA - 1] = NATIONAL_DEX_BLASTOISE, + [SPECIES_BEEDRILL_MEGA - 1] = NATIONAL_DEX_BEEDRILL, + [SPECIES_PIDGEOT_MEGA - 1] = NATIONAL_DEX_PIDGEOT, + [SPECIES_ALAKAZAM_MEGA - 1] = NATIONAL_DEX_ALAKAZAM, + [SPECIES_SLOWBRO_MEGA - 1] = NATIONAL_DEX_SLOWBRO, + [SPECIES_GENGAR_MEGA - 1] = NATIONAL_DEX_GENGAR, + [SPECIES_KANGASKHAN_MEGA - 1] = NATIONAL_DEX_KANGASKHAN, + [SPECIES_PINSIR_MEGA - 1] = NATIONAL_DEX_PINSIR, + [SPECIES_GYARADOS_MEGA - 1] = NATIONAL_DEX_GYARADOS, + [SPECIES_AERODACTYL_MEGA - 1] = NATIONAL_DEX_AERODACTYL, + [SPECIES_MEWTWO_MEGA_X - 1] = NATIONAL_DEX_MEWTWO, + [SPECIES_MEWTWO_MEGA_Y - 1] = NATIONAL_DEX_MEWTWO, + [SPECIES_AMPHAROS_MEGA - 1] = NATIONAL_DEX_AMPHAROS, + [SPECIES_STEELIX_MEGA - 1] = NATIONAL_DEX_STEELIX, + [SPECIES_SCIZOR_MEGA - 1] = NATIONAL_DEX_SCIZOR, + [SPECIES_HERACROSS_MEGA - 1] = NATIONAL_DEX_HERACROSS, + [SPECIES_HOUNDOOM_MEGA - 1] = NATIONAL_DEX_HOUNDOOM, + [SPECIES_TYRANITAR_MEGA - 1] = NATIONAL_DEX_TYRANITAR, + [SPECIES_SCEPTILE_MEGA - 1] = NATIONAL_DEX_SCEPTILE, + [SPECIES_BLAZIKEN_MEGA - 1] = NATIONAL_DEX_BLAZIKEN, + [SPECIES_SWAMPERT_MEGA - 1] = NATIONAL_DEX_SWAMPERT, + [SPECIES_GARDEVOIR_MEGA - 1] = NATIONAL_DEX_GARDEVOIR, + [SPECIES_SABLEYE_MEGA - 1] = NATIONAL_DEX_SABLEYE, + [SPECIES_MAWILE_MEGA - 1] = NATIONAL_DEX_MAWILE, + [SPECIES_AGGRON_MEGA - 1] = NATIONAL_DEX_AGGRON, + [SPECIES_MEDICHAM_MEGA - 1] = NATIONAL_DEX_MEDICHAM, + [SPECIES_MANECTRIC_MEGA - 1] = NATIONAL_DEX_MANECTRIC, + [SPECIES_SHARPEDO_MEGA - 1] = NATIONAL_DEX_SHARPEDO, + [SPECIES_CAMERUPT_MEGA - 1] = NATIONAL_DEX_CAMERUPT, + [SPECIES_ALTARIA_MEGA - 1] = NATIONAL_DEX_ALTARIA, + [SPECIES_BANETTE_MEGA - 1] = NATIONAL_DEX_BANETTE, + [SPECIES_ABSOL_MEGA - 1] = NATIONAL_DEX_ABSOL, + [SPECIES_GLALIE_MEGA - 1] = NATIONAL_DEX_GLALIE, + [SPECIES_SALAMENCE_MEGA - 1] = NATIONAL_DEX_SALAMENCE, + [SPECIES_METAGROSS_MEGA - 1] = NATIONAL_DEX_METAGROSS, + [SPECIES_LATIAS_MEGA - 1] = NATIONAL_DEX_LATIAS, + [SPECIES_LATIOS_MEGA - 1] = NATIONAL_DEX_LATIOS, + [SPECIES_LOPUNNY_MEGA - 1] = NATIONAL_DEX_LOPUNNY, + [SPECIES_GARCHOMP_MEGA - 1] = NATIONAL_DEX_GARCHOMP, + [SPECIES_LUCARIO_MEGA - 1] = NATIONAL_DEX_LUCARIO, + [SPECIES_ABOMASNOW_MEGA - 1] = NATIONAL_DEX_ABOMASNOW, + [SPECIES_GALLADE_MEGA - 1] = NATIONAL_DEX_GALLADE, + [SPECIES_AUDINO_MEGA - 1] = NATIONAL_DEX_AUDINO, + [SPECIES_DIANCIE_MEGA - 1] = NATIONAL_DEX_DIANCIE, // Special Mega + Primals - [SPECIES_MEGA_RAYQUAZA - 1] = NATIONAL_DEX_RAYQUAZA, - [SPECIES_PRIMAL_KYOGRE - 1] = NATIONAL_DEX_KYOGRE, - [SPECIES_PRIMAL_GROUDON - 1] = NATIONAL_DEX_GROUDON, + [SPECIES_RAYQUAZA_MEGA - 1] = NATIONAL_DEX_RAYQUAZA, + [SPECIES_KYOGRE_PRIMAL - 1] = NATIONAL_DEX_KYOGRE, + [SPECIES_GROUDON_PRIMAL - 1] = NATIONAL_DEX_GROUDON, // Alolan Forms - [SPECIES_ALOLAN_RATTATA - 1] = NATIONAL_DEX_RATTATA, - [SPECIES_ALOLAN_RATICATE - 1] = NATIONAL_DEX_RATICATE, - [SPECIES_ALOLAN_RAICHU - 1] = NATIONAL_DEX_RAICHU, - [SPECIES_ALOLAN_VULPIX - 1] = NATIONAL_DEX_VULPIX, - [SPECIES_ALOLAN_NINETALES - 1] = NATIONAL_DEX_NINETALES, - [SPECIES_ALOLAN_DIGLETT - 1] = NATIONAL_DEX_DIGLETT, - [SPECIES_ALOLAN_DUGTRIO - 1] = NATIONAL_DEX_DUGTRIO, - [SPECIES_ALOLAN_MEOWTH - 1] = NATIONAL_DEX_MEOWTH, - [SPECIES_ALOLAN_PERSIAN - 1] = NATIONAL_DEX_PERSIAN, - [SPECIES_ALOLAN_GEODUDE - 1] = NATIONAL_DEX_GEODUDE, - [SPECIES_ALOLAN_GRAVELER - 1] = NATIONAL_DEX_GRAVELER, - [SPECIES_ALOLAN_GOLEM - 1] = NATIONAL_DEX_GOLEM, - [SPECIES_ALOLAN_GRIMER - 1] = NATIONAL_DEX_GRIMER, - [SPECIES_ALOLAN_MUK - 1] = NATIONAL_DEX_MUK, - [SPECIES_ALOLAN_EXEGGUTOR - 1] = NATIONAL_DEX_EXEGGUTOR, - [SPECIES_ALOLAN_MAROWAK - 1] = NATIONAL_DEX_MAROWAK, + [SPECIES_RATTATA_ALOLAN - 1] = NATIONAL_DEX_RATTATA, + [SPECIES_RATICATE_ALOLAN - 1] = NATIONAL_DEX_RATICATE, + [SPECIES_RAICHU_ALOLAN - 1] = NATIONAL_DEX_RAICHU, + [SPECIES_VULPIX_ALOLAN - 1] = NATIONAL_DEX_VULPIX, + [SPECIES_NINETALES_ALOLAN - 1] = NATIONAL_DEX_NINETALES, + [SPECIES_DIGLETT_ALOLAN - 1] = NATIONAL_DEX_DIGLETT, + [SPECIES_DUGTRIO_ALOLAN - 1] = NATIONAL_DEX_DUGTRIO, + [SPECIES_MEOWTH_ALOLAN - 1] = NATIONAL_DEX_MEOWTH, + [SPECIES_PERSIAN_ALOLAN - 1] = NATIONAL_DEX_PERSIAN, + [SPECIES_GEODUDE_ALOLAN - 1] = NATIONAL_DEX_GEODUDE, + [SPECIES_GRAVELER_ALOLAN - 1] = NATIONAL_DEX_GRAVELER, + [SPECIES_GOLEM_ALOLAN - 1] = NATIONAL_DEX_GOLEM, + [SPECIES_GRIMER_ALOLAN - 1] = NATIONAL_DEX_GRIMER, + [SPECIES_MUK_ALOLAN - 1] = NATIONAL_DEX_MUK, + [SPECIES_EXEGGUTOR_ALOLAN - 1] = NATIONAL_DEX_EXEGGUTOR, + [SPECIES_MAROWAK_ALOLAN - 1] = NATIONAL_DEX_MAROWAK, // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU, [SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU, @@ -1363,7 +1363,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to [SPECIES_FURFROU_KABUKI_TRIM - 1] = NATIONAL_DEX_FURFROU, [SPECIES_FURFROU_PHARAOH_TRIM - 1] = NATIONAL_DEX_FURFROU, // Meowstic - [SPECIES_MEOWSTIC_F - 1] = NATIONAL_DEX_MEOWSTIC, + [SPECIES_MEOWSTIC_FEMALE - 1] = NATIONAL_DEX_MEOWSTIC, // Aegislash [SPECIES_AEGISLASH_BLADE - 1] = NATIONAL_DEX_AEGISLASH, // Pumpkaboo diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 7cec14e9c..4efddeb68 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -834,74 +834,74 @@ const u8 *const gMonIconTable[] = [SPECIES_ZERAORA] = gMonIcon_Zeraora, [SPECIES_MELTAN] = gMonIcon_Meltan, [SPECIES_MELMETAL] = gMonIcon_Melmetal, - [SPECIES_MEGA_VENUSAUR] = gMonIcon_MegaVenusaur, - [SPECIES_MEGA_CHARIZARD_X] = gMonIcon_MegaCharizardX, - [SPECIES_MEGA_CHARIZARD_Y] = gMonIcon_MegaCharizardY, - [SPECIES_MEGA_BLASTOISE] = gMonIcon_MegaBlastoise, - [SPECIES_MEGA_BEEDRILL] = gMonIcon_MegaBeedrill, - [SPECIES_MEGA_PIDGEOT] = gMonIcon_MegaPidgeot, - [SPECIES_MEGA_ALAKAZAM] = gMonIcon_MegaAlakazam, - [SPECIES_MEGA_SLOWBRO] = gMonIcon_MegaSlowbro, - [SPECIES_MEGA_GENGAR] = gMonIcon_MegaGengar, - [SPECIES_MEGA_KANGASKHAN] = gMonIcon_MegaKangaskhan, - [SPECIES_MEGA_PINSIR] = gMonIcon_MegaPinsir, - [SPECIES_MEGA_GYARADOS] = gMonIcon_MegaGyarados, - [SPECIES_MEGA_AERODACTYL] = gMonIcon_MegaAerodactyl, - [SPECIES_MEGA_MEWTWO_X] = gMonIcon_MegaMewtwoX, - [SPECIES_MEGA_MEWTWO_Y] = gMonIcon_MegaMewtwoY, - [SPECIES_MEGA_AMPHAROS] = gMonIcon_MegaAmpharos, - [SPECIES_MEGA_STEELIX] = gMonIcon_MegaSteelix, - [SPECIES_MEGA_SCIZOR] = gMonIcon_MegaScizor, - [SPECIES_MEGA_HERACROSS] = gMonIcon_MegaHeracross, - [SPECIES_MEGA_HOUNDOOM] = gMonIcon_MegaHoundoom, - [SPECIES_MEGA_TYRANITAR] = gMonIcon_MegaTyranitar, - [SPECIES_MEGA_SCEPTILE] = gMonIcon_MegaSceptile, - [SPECIES_MEGA_BLAZIKEN] = gMonIcon_MegaBlaziken, - [SPECIES_MEGA_SWAMPERT] = gMonIcon_MegaSwampert, - [SPECIES_MEGA_GARDEVOIR] = gMonIcon_MegaGardevoir, - [SPECIES_MEGA_SABLEYE] = gMonIcon_MegaSableye, - [SPECIES_MEGA_MAWILE] = gMonIcon_MegaMawile, - [SPECIES_MEGA_AGGRON] = gMonIcon_MegaAggron, - [SPECIES_MEGA_MEDICHAM] = gMonIcon_MegaMedicham, - [SPECIES_MEGA_MANECTRIC] = gMonIcon_MegaManectric, - [SPECIES_MEGA_SHARPEDO] = gMonIcon_MegaSharpedo, - [SPECIES_MEGA_CAMERUPT] = gMonIcon_MegaCamerupt, - [SPECIES_MEGA_ALTARIA] = gMonIcon_MegaAltaria, - [SPECIES_MEGA_BANETTE] = gMonIcon_MegaBanette, - [SPECIES_MEGA_ABSOL] = gMonIcon_MegaAbsol, - [SPECIES_MEGA_GLALIE] = gMonIcon_MegaGlalie, - [SPECIES_MEGA_SALAMENCE] = gMonIcon_MegaSalamence, - [SPECIES_MEGA_METAGROSS] = gMonIcon_MegaMetagross, - [SPECIES_MEGA_LATIAS] = gMonIcon_MegaLatias, - [SPECIES_MEGA_LATIOS] = gMonIcon_MegaLatios, - [SPECIES_MEGA_LOPUNNY] = gMonIcon_MegaLopunny, - [SPECIES_MEGA_GARCHOMP] = gMonIcon_MegaGarchomp, - [SPECIES_MEGA_LUCARIO] = gMonIcon_MegaLucario, - [SPECIES_MEGA_ABOMASNOW] = gMonIcon_MegaAbomasnow, - [SPECIES_MEGA_GALLADE] = gMonIcon_MegaGallade, - [SPECIES_MEGA_AUDINO] = gMonIcon_MegaAudino, - [SPECIES_MEGA_DIANCIE] = gMonIcon_MegaDiancie, - [SPECIES_MEGA_RAYQUAZA] = gMonIcon_MegaRayquaza, - [SPECIES_PRIMAL_KYOGRE] = gMonIcon_PrimalKyogre, - [SPECIES_PRIMAL_GROUDON] = gMonIcon_PrimalGroudon, - [SPECIES_ALOLAN_RATTATA] = gMonIcon_AlolanRattata, - [SPECIES_ALOLAN_RATICATE] = gMonIcon_AlolanRaticate, - [SPECIES_ALOLAN_RAICHU] = gMonIcon_AlolanRaichu, - [SPECIES_ALOLAN_SANDSHREW] = gMonIcon_AlolanSandshrew, - [SPECIES_ALOLAN_SANDSLASH] = gMonIcon_AlolanSandslash, - [SPECIES_ALOLAN_VULPIX] = gMonIcon_AlolanVulpix, - [SPECIES_ALOLAN_NINETALES] = gMonIcon_AlolanNinetales, - [SPECIES_ALOLAN_DIGLETT] = gMonIcon_AlolanDiglett, - [SPECIES_ALOLAN_DUGTRIO] = gMonIcon_AlolanDugtrio, - [SPECIES_ALOLAN_MEOWTH] = gMonIcon_AlolanMeowth, - [SPECIES_ALOLAN_PERSIAN] = gMonIcon_AlolanPersian, - [SPECIES_ALOLAN_GEODUDE] = gMonIcon_AlolanGeodude, - [SPECIES_ALOLAN_GRAVELER] = gMonIcon_AlolanGraveler, - [SPECIES_ALOLAN_GOLEM] = gMonIcon_AlolanGolem, - [SPECIES_ALOLAN_GRIMER] = gMonIcon_AlolanGrimer, - [SPECIES_ALOLAN_MUK] = gMonIcon_AlolanMuk, - [SPECIES_ALOLAN_EXEGGUTOR] = gMonIcon_AlolanExeggutor, - [SPECIES_ALOLAN_MAROWAK] = gMonIcon_AlolanMarowak, + [SPECIES_VENUSAUR_MEGA] = gMonIcon_MegaVenusaur, + [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_MegaCharizardX, + [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_MegaCharizardY, + [SPECIES_BLASTOISE_MEGA] = gMonIcon_MegaBlastoise, + [SPECIES_BEEDRILL_MEGA] = gMonIcon_MegaBeedrill, + [SPECIES_PIDGEOT_MEGA] = gMonIcon_MegaPidgeot, + [SPECIES_ALAKAZAM_MEGA] = gMonIcon_MegaAlakazam, + [SPECIES_SLOWBRO_MEGA] = gMonIcon_MegaSlowbro, + [SPECIES_GENGAR_MEGA] = gMonIcon_MegaGengar, + [SPECIES_KANGASKHAN_MEGA] = gMonIcon_MegaKangaskhan, + [SPECIES_PINSIR_MEGA] = gMonIcon_MegaPinsir, + [SPECIES_GYARADOS_MEGA] = gMonIcon_MegaGyarados, + [SPECIES_AERODACTYL_MEGA] = gMonIcon_MegaAerodactyl, + [SPECIES_MEWTWO_MEGA_X] = gMonIcon_MegaMewtwoX, + [SPECIES_MEWTWO_MEGA_Y] = gMonIcon_MegaMewtwoY, + [SPECIES_AMPHAROS_MEGA] = gMonIcon_MegaAmpharos, + [SPECIES_STEELIX_MEGA] = gMonIcon_MegaSteelix, + [SPECIES_SCIZOR_MEGA] = gMonIcon_MegaScizor, + [SPECIES_HERACROSS_MEGA] = gMonIcon_MegaHeracross, + [SPECIES_HOUNDOOM_MEGA] = gMonIcon_MegaHoundoom, + [SPECIES_TYRANITAR_MEGA] = gMonIcon_MegaTyranitar, + [SPECIES_SCEPTILE_MEGA] = gMonIcon_MegaSceptile, + [SPECIES_BLAZIKEN_MEGA] = gMonIcon_MegaBlaziken, + [SPECIES_SWAMPERT_MEGA] = gMonIcon_MegaSwampert, + [SPECIES_GARDEVOIR_MEGA] = gMonIcon_MegaGardevoir, + [SPECIES_SABLEYE_MEGA] = gMonIcon_MegaSableye, + [SPECIES_MAWILE_MEGA] = gMonIcon_MegaMawile, + [SPECIES_AGGRON_MEGA] = gMonIcon_MegaAggron, + [SPECIES_MEDICHAM_MEGA] = gMonIcon_MegaMedicham, + [SPECIES_MANECTRIC_MEGA] = gMonIcon_MegaManectric, + [SPECIES_SHARPEDO_MEGA] = gMonIcon_MegaSharpedo, + [SPECIES_CAMERUPT_MEGA] = gMonIcon_MegaCamerupt, + [SPECIES_ALTARIA_MEGA] = gMonIcon_MegaAltaria, + [SPECIES_BANETTE_MEGA] = gMonIcon_MegaBanette, + [SPECIES_ABSOL_MEGA] = gMonIcon_MegaAbsol, + [SPECIES_GLALIE_MEGA] = gMonIcon_MegaGlalie, + [SPECIES_SALAMENCE_MEGA] = gMonIcon_MegaSalamence, + [SPECIES_METAGROSS_MEGA] = gMonIcon_MegaMetagross, + [SPECIES_LATIAS_MEGA] = gMonIcon_MegaLatias, + [SPECIES_LATIOS_MEGA] = gMonIcon_MegaLatios, + [SPECIES_LOPUNNY_MEGA] = gMonIcon_MegaLopunny, + [SPECIES_GARCHOMP_MEGA] = gMonIcon_MegaGarchomp, + [SPECIES_LUCARIO_MEGA] = gMonIcon_MegaLucario, + [SPECIES_ABOMASNOW_MEGA] = gMonIcon_MegaAbomasnow, + [SPECIES_GALLADE_MEGA] = gMonIcon_MegaGallade, + [SPECIES_AUDINO_MEGA] = gMonIcon_MegaAudino, + [SPECIES_DIANCIE_MEGA] = gMonIcon_MegaDiancie, + [SPECIES_RAYQUAZA_MEGA] = gMonIcon_MegaRayquaza, + [SPECIES_KYOGRE_PRIMAL] = gMonIcon_PrimalKyogre, + [SPECIES_GROUDON_PRIMAL] = gMonIcon_PrimalGroudon, + [SPECIES_RATTATA_ALOLAN] = gMonIcon_AlolanRattata, + [SPECIES_RATICATE_ALOLAN] = gMonIcon_AlolanRaticate, + [SPECIES_RAICHU_ALOLAN] = gMonIcon_AlolanRaichu, + [SPECIES_SANDSHREW_ALOLAN] = gMonIcon_AlolanSandshrew, + [SPECIES_SANDSLASH_ALOLAN] = gMonIcon_AlolanSandslash, + [SPECIES_VULPIX_ALOLAN] = gMonIcon_AlolanVulpix, + [SPECIES_NINETALES_ALOLAN] = gMonIcon_AlolanNinetales, + [SPECIES_DIGLETT_ALOLAN] = gMonIcon_AlolanDiglett, + [SPECIES_DUGTRIO_ALOLAN] = gMonIcon_AlolanDugtrio, + [SPECIES_MEOWTH_ALOLAN] = gMonIcon_AlolanMeowth, + [SPECIES_PERSIAN_ALOLAN] = gMonIcon_AlolanPersian, + [SPECIES_GEODUDE_ALOLAN] = gMonIcon_AlolanGeodude, + [SPECIES_GRAVELER_ALOLAN] = gMonIcon_AlolanGraveler, + [SPECIES_GOLEM_ALOLAN] = gMonIcon_AlolanGolem, + [SPECIES_GRIMER_ALOLAN] = gMonIcon_AlolanGrimer, + [SPECIES_MUK_ALOLAN] = gMonIcon_AlolanMuk, + [SPECIES_EXEGGUTOR_ALOLAN] = gMonIcon_AlolanExeggutor, + [SPECIES_MAROWAK_ALOLAN] = gMonIcon_AlolanMarowak, [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, @@ -1042,7 +1042,7 @@ const u8 *const gMonIconTable[] = [SPECIES_FURFROU_LA_REINE_TRIM] = gMonIcon_FurfrouLaReineTrim, [SPECIES_FURFROU_KABUKI_TRIM] = gMonIcon_FurfrouKabukiTrim, [SPECIES_FURFROU_PHARAOH_TRIM] = gMonIcon_FurfrouPharaohTrim, - [SPECIES_MEOWSTIC_F] = gMonIcon_MeowsticFemale, + [SPECIES_MEOWSTIC_FEMALE] = gMonIcon_MeowsticFemale, [SPECIES_AEGISLASH_BLADE] = gMonIcon_AegislashBlade, [SPECIES_PUMPKABOO_SMALL] = gMonIcon_Pumpkaboo, [SPECIES_PUMPKABOO_LARGE] = gMonIcon_Pumpkaboo, @@ -1912,74 +1912,74 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZERAORA] = 0, [SPECIES_MELTAN] = 2, [SPECIES_MELMETAL] = 2, - [SPECIES_MEGA_VENUSAUR] = 1, - [SPECIES_MEGA_CHARIZARD_X] = 0, - [SPECIES_MEGA_CHARIZARD_Y] = 0, - [SPECIES_MEGA_BLASTOISE] = 2, - [SPECIES_MEGA_BEEDRILL] = 2, - [SPECIES_MEGA_PIDGEOT] = 0, - [SPECIES_MEGA_ALAKAZAM] = 2, - [SPECIES_MEGA_SLOWBRO] = 0, - [SPECIES_MEGA_GENGAR] = 2, - [SPECIES_MEGA_KANGASKHAN] = 2, - [SPECIES_MEGA_PINSIR] = 2, - [SPECIES_MEGA_GYARADOS] = 0, - [SPECIES_MEGA_AERODACTYL] = 2, - [SPECIES_MEGA_MEWTWO_X] = 2, - [SPECIES_MEGA_MEWTWO_Y] = 2, - [SPECIES_MEGA_AMPHAROS] = 0, - [SPECIES_MEGA_STEELIX] = 0, - [SPECIES_MEGA_SCIZOR] = 0, - [SPECIES_MEGA_HERACROSS] = 0, - [SPECIES_MEGA_HOUNDOOM] = 0, - [SPECIES_MEGA_TYRANITAR] = 1, - [SPECIES_MEGA_SCEPTILE] = 1, - [SPECIES_MEGA_BLAZIKEN] = 0, - [SPECIES_MEGA_SWAMPERT] = 0, - [SPECIES_MEGA_GARDEVOIR] = 1, - [SPECIES_MEGA_SABLEYE] = 2, - [SPECIES_MEGA_MAWILE] = 0, - [SPECIES_MEGA_AGGRON] = 2, - [SPECIES_MEGA_MEDICHAM] = 0, - [SPECIES_MEGA_MANECTRIC] = 0, - [SPECIES_MEGA_SHARPEDO] = 0, - [SPECIES_MEGA_CAMERUPT] = 0, - [SPECIES_MEGA_ALTARIA] = 0, - [SPECIES_MEGA_BANETTE] = 0, - [SPECIES_MEGA_ABSOL] = 0, - [SPECIES_MEGA_GLALIE] = 0, - [SPECIES_MEGA_SALAMENCE] = 0, - [SPECIES_MEGA_METAGROSS] = 0, - [SPECIES_MEGA_LATIAS] = 2, - [SPECIES_MEGA_LATIOS] = 2, - [SPECIES_PRIMAL_KYOGRE] = 0, - [SPECIES_PRIMAL_GROUDON] = 0, - [SPECIES_MEGA_RAYQUAZA] = 1, - [SPECIES_MEGA_LOPUNNY] = 2, - [SPECIES_MEGA_GARCHOMP] = 0, - [SPECIES_MEGA_LUCARIO] = 2, - [SPECIES_MEGA_ABOMASNOW] = 1, - [SPECIES_MEGA_GALLADE] = 1, - [SPECIES_MEGA_AUDINO] = 1, - [SPECIES_MEGA_DIANCIE] = 0, - [SPECIES_ALOLAN_RATTATA] = 2, - [SPECIES_ALOLAN_RATICATE] = 2, - [SPECIES_ALOLAN_RAICHU] = 2, - [SPECIES_ALOLAN_SANDSHREW] = 0, - [SPECIES_ALOLAN_SANDSLASH] = 0, - [SPECIES_ALOLAN_VULPIX] = 2, - [SPECIES_ALOLAN_NINETALES] = 2, - [SPECIES_ALOLAN_DIGLETT] = 2, - [SPECIES_ALOLAN_DUGTRIO] = 2, - [SPECIES_ALOLAN_MEOWTH] = 2, - [SPECIES_ALOLAN_PERSIAN] = 2, - [SPECIES_ALOLAN_GEODUDE] = 2, - [SPECIES_ALOLAN_GRAVELER] = 2, - [SPECIES_ALOLAN_GOLEM] = 2, - [SPECIES_ALOLAN_GRIMER] = 1, - [SPECIES_ALOLAN_MUK] = 0, - [SPECIES_ALOLAN_EXEGGUTOR] = 1, - [SPECIES_ALOLAN_MAROWAK] = 1, + [SPECIES_VENUSAUR_MEGA] = 1, + [SPECIES_CHARIZARD_MEGA_X] = 0, + [SPECIES_CHARIZARD_MEGA_Y] = 0, + [SPECIES_BLASTOISE_MEGA] = 2, + [SPECIES_BEEDRILL_MEGA] = 2, + [SPECIES_PIDGEOT_MEGA] = 0, + [SPECIES_ALAKAZAM_MEGA] = 2, + [SPECIES_SLOWBRO_MEGA] = 0, + [SPECIES_GENGAR_MEGA] = 2, + [SPECIES_KANGASKHAN_MEGA] = 2, + [SPECIES_PINSIR_MEGA] = 2, + [SPECIES_GYARADOS_MEGA] = 0, + [SPECIES_AERODACTYL_MEGA] = 2, + [SPECIES_MEWTWO_MEGA_X] = 2, + [SPECIES_MEWTWO_MEGA_Y] = 2, + [SPECIES_AMPHAROS_MEGA] = 0, + [SPECIES_STEELIX_MEGA] = 0, + [SPECIES_SCIZOR_MEGA] = 0, + [SPECIES_HERACROSS_MEGA] = 0, + [SPECIES_HOUNDOOM_MEGA] = 0, + [SPECIES_TYRANITAR_MEGA] = 1, + [SPECIES_SCEPTILE_MEGA] = 1, + [SPECIES_BLAZIKEN_MEGA] = 0, + [SPECIES_SWAMPERT_MEGA] = 0, + [SPECIES_GARDEVOIR_MEGA] = 1, + [SPECIES_SABLEYE_MEGA] = 2, + [SPECIES_MAWILE_MEGA] = 0, + [SPECIES_AGGRON_MEGA] = 2, + [SPECIES_MEDICHAM_MEGA] = 0, + [SPECIES_MANECTRIC_MEGA] = 0, + [SPECIES_SHARPEDO_MEGA] = 0, + [SPECIES_CAMERUPT_MEGA] = 0, + [SPECIES_ALTARIA_MEGA] = 0, + [SPECIES_BANETTE_MEGA] = 0, + [SPECIES_ABSOL_MEGA] = 0, + [SPECIES_GLALIE_MEGA] = 0, + [SPECIES_SALAMENCE_MEGA] = 0, + [SPECIES_METAGROSS_MEGA] = 0, + [SPECIES_LATIAS_MEGA] = 2, + [SPECIES_LATIOS_MEGA] = 2, + [SPECIES_KYOGRE_PRIMAL] = 0, + [SPECIES_GROUDON_PRIMAL] = 0, + [SPECIES_RAYQUAZA_MEGA] = 1, + [SPECIES_LOPUNNY_MEGA] = 2, + [SPECIES_GARCHOMP_MEGA] = 0, + [SPECIES_LUCARIO_MEGA] = 2, + [SPECIES_ABOMASNOW_MEGA] = 1, + [SPECIES_GALLADE_MEGA] = 1, + [SPECIES_AUDINO_MEGA] = 1, + [SPECIES_DIANCIE_MEGA] = 0, + [SPECIES_RATTATA_ALOLAN] = 2, + [SPECIES_RATICATE_ALOLAN] = 2, + [SPECIES_RAICHU_ALOLAN] = 2, + [SPECIES_SANDSHREW_ALOLAN] = 0, + [SPECIES_SANDSLASH_ALOLAN] = 0, + [SPECIES_VULPIX_ALOLAN] = 2, + [SPECIES_NINETALES_ALOLAN] = 2, + [SPECIES_DIGLETT_ALOLAN] = 2, + [SPECIES_DUGTRIO_ALOLAN] = 2, + [SPECIES_MEOWTH_ALOLAN] = 2, + [SPECIES_PERSIAN_ALOLAN] = 2, + [SPECIES_GEODUDE_ALOLAN] = 2, + [SPECIES_GRAVELER_ALOLAN] = 2, + [SPECIES_GOLEM_ALOLAN] = 2, + [SPECIES_GRIMER_ALOLAN] = 1, + [SPECIES_MUK_ALOLAN] = 0, + [SPECIES_EXEGGUTOR_ALOLAN] = 1, + [SPECIES_MAROWAK_ALOLAN] = 1, [SPECIES_PIKACHU_COSPLAY] = 2, [SPECIES_PIKACHU_ROCK_STAR] = 1, [SPECIES_PIKACHU_BELLE] = 0, @@ -2091,7 +2091,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_FURFROU_LA_REINE_TRIM] = 0, [SPECIES_FURFROU_KABUKI_TRIM] = 0, [SPECIES_FURFROU_PHARAOH_TRIM] = 0, - [SPECIES_MEOWSTIC_F] = 0, + [SPECIES_MEOWSTIC_FEMALE] = 0, [SPECIES_AEGISLASH_BLADE] = 2, [SPECIES_PUMPKABOO_SMALL] = 2, [SPECIES_PUMPKABOO_LARGE] = 2,