From a0d9f6f5d7c54c1ae53642ca2862ab114215dc52 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 11 Oct 2022 02:02:49 -0300 Subject: [PATCH] Enamorus --- src/data/pokemon/form_change_table_pointers.h | 2 +- src/data/pokemon/form_species_tables.h | 2 +- src/data/pokemon/pokedex_orders.h | 2 +- src/pokemon.c | 2 +- src/pokemon_icon.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index da629f11fd..8eaf42768e 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -74,7 +74,7 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_ZACIAN_CROWNED_SWORD] = sZacianFormChangeTable, [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = sZamazentaFormChangeTable, [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaFormChangeTable, - [SPECIES_ENAMORUS] = sEnamorusFormChangeTable, + [SPECIES_ENAMORUS_INCARNATE] = sEnamorusFormChangeTable, [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormChangeTable, #endif }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index d4b2bc35ce..366ae52a80 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1188,7 +1188,7 @@ static const u16 sCalyrexFormSpeciesIdTable[] = { }; static const u16 sEnamorusFormSpeciesIdTable[] = { - SPECIES_ENAMORUS, + SPECIES_ENAMORUS_INCARNATE, SPECIES_ENAMORUS_THERIAN, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index acac686aca..9e5f13f705 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -1615,7 +1615,7 @@ const u16 gPokedexOrder_Weight[] = SPECIES_HAKAMO_O, SPECIES_ALAKAZAM, SPECIES_HITMONTOP, - SPECIES_ENAMORUS, + SPECIES_ENAMORUS_INCARNATE, SPECIES_GARDEVOIR, SPECIES_KELDEO, SPECIES_GRANBULL, diff --git a/src/pokemon.c b/src/pokemon.c index 45dcdfd676..f275b2346a 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3015,7 +3015,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_BASCULEGION - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SNEASLER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_OVERQWIL - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ENAMORUS - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ENAMORUS_INCARNATE - 1] = ANIM_V_SQUISH_AND_BOUNCE, }; static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index f551d87a30..a8862e7f9d 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -2597,7 +2597,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BASCULEGION] = 1, [SPECIES_SNEASLER] = 2, [SPECIES_OVERQWIL] = 2, - [SPECIES_ENAMORUS] = 1, + [SPECIES_ENAMORUS_INCARNATE] = 1, [SPECIES_ENAMORUS_THERIAN] = 1, [SPECIES_EGG] = 1, };