diff --git a/include/constants/species.h b/include/constants/species.h index 9bfd68050b..60dcb30071 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1570,14 +1570,14 @@ #define SPECIES_GIMMIGHOUL_ROAMING GEN9_START + 115 // Tauros-Paldea -#define SPECIES_TAUROS_PALDEAN_BLAZE_BREED GEN9_START + 116 -#define SPECIES_TAUROS_PALDEAN_AQUA_BREED GEN9_START + 117 +#define SPECIES_TAUROS_PALDEAN_COMBAT_BREED GEN9_START + 116 +#define SPECIES_TAUROS_PALDEAN_BLAZE_BREED GEN9_START + 117 +#define SPECIES_TAUROS_PALDEAN_AQUA_BREED GEN9_START + 118 // Paldean Forms -#define SPECIES_WOOPER_PALDEAN GEN9_START + 118 -#define SPECIES_TAUROS_PALDEAN GEN9_START + 119 +#define SPECIES_WOOPER_PALDEAN GEN9_START + 119 -#define GIGANTAMAX_START SPECIES_TAUROS_PALDEAN +#define GIGANTAMAX_START SPECIES_WOOPER_PALDEAN // Gigantamax Forms #define SPECIES_VENUSAUR_GIGANTAMAX GIGANTAMAX_START + 1 diff --git a/include/graphics.h b/include/graphics.h index 4ec8511e3c..5122766fd9 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -215,24 +215,24 @@ extern const u32 gMonFrontPic_Electabuzz[]; extern const u32 gMonFrontPic_Magmar[]; extern const u32 gMonFrontPic_Pinsir[]; extern const u32 gMonFrontPic_Tauros[]; -extern const u32 gMonFrontPic_TaurosCombatBreed[]; -extern const u32 gMonPalette_TaurosCombatBreed[]; -extern const u32 gMonBackPic_TaurosCombatBreed[]; -extern const u32 gMonShinyPalette_TaurosCombatBreed[]; -extern const u8 gMonIcon_TaurosCombatBreed[]; -// extern const u8 gMonFootprint_TaurosCombatBreed[]; -extern const u32 gMonFrontPic_TaurosBlazeBreed[]; -extern const u32 gMonPalette_TaurosBlazeBreed[]; -extern const u32 gMonBackPic_TaurosBlazeBreed[]; -extern const u32 gMonShinyPalette_TaurosBlazeBreed[]; -extern const u8 gMonIcon_TaurosBlazeBreed[]; -// extern const u8 gMonFootprint_TaurosBlazeBreed[]; -extern const u32 gMonFrontPic_TaurosAquaBreed[]; -extern const u32 gMonPalette_TaurosAquaBreed[]; -extern const u32 gMonBackPic_TaurosAquaBreed[]; -extern const u32 gMonShinyPalette_TaurosAquaBreed[]; -extern const u8 gMonIcon_TaurosAquaBreed[]; -// extern const u8 gMonFootprint_TaurosAquaBreed[]; +extern const u32 gMonFrontPic_TaurosPaldeanCombatBreed[]; +extern const u32 gMonPalette_TaurosPaldeanCombatBreed[]; +extern const u32 gMonBackPic_TaurosPaldeanCombatBreed[]; +extern const u32 gMonShinyPalette_TaurosPaldeanCombatBreed[]; +extern const u8 gMonIcon_TaurosPaldeanCombatBreed[]; +// extern const u8 gMonFootprint_TaurosPaldeanCombatBreed[]; +extern const u32 gMonFrontPic_TaurosPaldeanBlazeBreed[]; +extern const u32 gMonPalette_TaurosPaldeanBlazeBreed[]; +extern const u32 gMonBackPic_TaurosPaldeanBlazeBreed[]; +extern const u32 gMonShinyPalette_TaurosPaldeanBlazeBreed[]; +extern const u8 gMonIcon_TaurosPaldeanBlazeBreed[]; +// extern const u8 gMonFootprint_TaurosPaldeanBlazeBreed[]; +extern const u32 gMonFrontPic_TaurosPaldeanAquaBreed[]; +extern const u32 gMonPalette_TaurosPaldeanAquaBreed[]; +extern const u32 gMonBackPic_TaurosPaldeanAquaBreed[]; +extern const u32 gMonShinyPalette_TaurosPaldeanAquaBreed[]; +extern const u8 gMonIcon_TaurosPaldeanAquaBreed[]; +// extern const u8 gMonFootprint_TaurosPaldeanAquaBreed[]; extern const u32 gMonFrontPic_Magikarp[]; extern const u32 gMonFrontPic_MagikarpF[]; extern const u32 gMonFrontPic_Gyarados[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 76aa6e7dff..d05eb8fc92 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -149,26 +149,26 @@ const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/anim_front.4bpp.lz"); const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/anim_front.4bpp.lz"); -const u32 gMonFrontPic_TaurosCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/front.4bpp.lz"); -const u32 gMonPalette_TaurosCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/normal.gbapal.lz"); -const u32 gMonBackPic_TaurosCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/back.4bpp.lz"); -const u32 gMonShinyPalette_TaurosCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/shiny.gbapal.lz"); -const u8 gMonIcon_TaurosCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/combat/icon.4bpp"); -// const u8 gMonFootprint_TaurosCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/combat/footprint.1bpp"); +const u32 gMonFrontPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/front.4bpp.lz"); +const u32 gMonPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/normal.gbapal.lz"); +const u32 gMonBackPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/back.4bpp.lz"); +const u32 gMonShinyPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/combat/shiny.gbapal.lz"); +const u8 gMonIcon_TaurosPaldeanCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/combat/icon.4bpp"); +// const u8 gMonFootprint_TaurosPaldeanCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/combat/footprint.1bpp"); -const u32 gMonFrontPic_TaurosBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/front.4bpp.lz"); -const u32 gMonPalette_TaurosBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/normal.gbapal.lz"); -const u32 gMonBackPic_TaurosBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/back.4bpp.lz"); -const u32 gMonShinyPalette_TaurosBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/shiny.gbapal.lz"); -const u8 gMonIcon_TaurosBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/blaze/icon.4bpp"); -// const u8 gMonFootprint_TaurosBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/blaze/footprint.1bpp"); +const u32 gMonFrontPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/front.4bpp.lz"); +const u32 gMonPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/normal.gbapal.lz"); +const u32 gMonBackPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/back.4bpp.lz"); +const u32 gMonShinyPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/blaze/shiny.gbapal.lz"); +const u8 gMonIcon_TaurosPaldeanBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/blaze/icon.4bpp"); +// const u8 gMonFootprint_TaurosPaldeanBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/blaze/footprint.1bpp"); -const u32 gMonFrontPic_TaurosAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/front.4bpp.lz"); -const u32 gMonPalette_TaurosAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/normal.gbapal.lz"); -const u32 gMonBackPic_TaurosAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/back.4bpp.lz"); -const u32 gMonShinyPalette_TaurosAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/shiny.gbapal.lz"); -const u8 gMonIcon_TaurosAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/aqua/icon.4bpp"); -// const u8 gMonFootprint_TaurosAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/aqua/footprint.1bpp"); +const u32 gMonFrontPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/front.4bpp.lz"); +const u32 gMonPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/normal.gbapal.lz"); +const u32 gMonBackPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/back.4bpp.lz"); +const u32 gMonShinyPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/aqua/shiny.gbapal.lz"); +const u8 gMonIcon_TaurosPaldeanAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/aqua/icon.4bpp"); +// const u8 gMonFootprint_TaurosPaldeanAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/aqua/footprint.1bpp"); const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/anim_front.4bpp.lz"); const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/anim_frontf.4bpp.lz"); diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 9b35bb93f7..fe0c85f0c2 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -4428,7 +4428,7 @@ const u16 gEggMoves[] = { MOVE_STOCKPILE, MOVE_SWALLOW), - egg_moves(TAUROS_PALDEAN, + egg_moves(TAUROS_PALDEAN_COMBAT_BREED, MOVE_CURSE, MOVE_ENDEAVOR), diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index f07d720bb2..438cc29bcc 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -307,7 +307,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, #endif [SPECIES_WOOPER_PALDEAN] = sWooperFormSpeciesIdTable, - [SPECIES_TAUROS_PALDEAN] = sTaurosFormSpeciesIdTable, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sTaurosFormSpeciesIdTable, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 21cbc0c6e0..7d666e6f1b 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -274,7 +274,7 @@ static const u16 sPinsirFormSpeciesIdTable[] = { static const u16 sTaurosFormSpeciesIdTable[] = { SPECIES_TAUROS, - SPECIES_TAUROS_PALDEAN, + SPECIES_TAUROS_PALDEAN_COMBAT_BREED, SPECIES_TAUROS_PALDEAN_BLAZE_BREED, SPECIES_TAUROS_PALDEAN_AQUA_BREED, FORM_SPECIES_END, diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 5d9b02d619..11c0719d94 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -1146,7 +1146,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset, #endif [SPECIES_WOOPER_PALDEAN] = sWooperPaldeanLevelUpLearnset, - [SPECIES_TAUROS_PALDEAN] = sTaurosPaldeanLevelUpLearnset, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sTaurosPaldeanCombatBreedLevelUpLearnset, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 6d76746ee2..ff2ede9c48 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -19181,7 +19181,7 @@ static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 9c15132526..d01e9732dd 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -4298,7 +4298,7 @@ const struct SpeciesInfo gSpeciesInfo[] = TAUROS_MISC_INFO }, - [SPECIES_TAUROS_PALDEAN] = + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = { .types = { TYPE_FIGHTING, TYPE_FIGHTING }, .evYield_Attack = 2, diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 610c34ac2b..43a9711ecc 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -1146,7 +1146,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset, #endif [SPECIES_WOOPER_PALDEAN] = sWooperPaldeanTeachableLearnset, - [SPECIES_TAUROS_PALDEAN] = sTaurosPaldeanTeachableLearnset, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sTaurosPaldeanCombatBreedTeachableLearnset, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuTeachableLearnset, diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index d30822b91d..4aa1c054b3 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -33058,7 +33058,7 @@ static const u16 sWooperPaldeanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sTaurosPaldeanTeachableLearnset[] = { +static const u16 sTaurosPaldeanCombatBreedTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_BODY_SLAM, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 724a3525aa..5886694ba6 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -152,9 +152,9 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_MAGMAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_PINSIR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_TAUROS] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, - [SPECIES_TAUROS_PALDEAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_MAGIKARP] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GYARADOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_LAPRAS] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index bff495fdd8..7b1ac07bda 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -129,9 +129,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(MAGMAR, gMonBackPic_Magmar), SPECIES_SPRITE(PINSIR, gMonBackPic_Pinsir), SPECIES_SPRITE(TAUROS, gMonBackPic_Tauros), - SPECIES_SPRITE(TAUROS_PALDEAN, gMonBackPic_TaurosCombatBreed), - SPECIES_SPRITE(TAUROS_PALDEAN_BLAZE_BREED, gMonBackPic_TaurosBlazeBreed), - SPECIES_SPRITE(TAUROS_PALDEAN_AQUA_BREED, gMonBackPic_TaurosAquaBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_COMBAT_BREED, gMonBackPic_TaurosPaldeanCombatBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_BLAZE_BREED, gMonBackPic_TaurosPaldeanBlazeBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_AQUA_BREED, gMonBackPic_TaurosPaldeanAquaBreed), SPECIES_SPRITE(MAGIKARP, gMonBackPic_Magikarp), SPECIES_SPRITE(GYARADOS, gMonBackPic_Gyarados), SPECIES_SPRITE(LAPRAS, gMonBackPic_Lapras), diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 78434f6b91..68b4951649 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -13255,7 +13255,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = #endif // Ungrouped [SPECIES_WOOPER_PALDEAN] = sAnims_WooperPaldean, - [SPECIES_TAUROS_PALDEAN] = sAnims_TaurosPaldean, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sAnims_TaurosPaldean, [SPECIES_PIKACHU_COSPLAY] = sAnims_PikachuCosplay, [SPECIES_PIKACHU_ROCK_STAR] = sAnims_PikachuRockStar, [SPECIES_PIKACHU_BELLE] = sAnims_PikachuBelle, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 25f8a9ba00..6e4a726dac 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -129,9 +129,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(MAGMAR, gMonFrontPic_Magmar), SPECIES_SPRITE(PINSIR, gMonFrontPic_Pinsir), SPECIES_SPRITE(TAUROS, gMonFrontPic_Tauros), - SPECIES_SPRITE(TAUROS_PALDEAN, gMonFrontPic_TaurosCombatBreed), - SPECIES_SPRITE(TAUROS_PALDEAN_BLAZE_BREED, gMonFrontPic_TaurosBlazeBreed), - SPECIES_SPRITE(TAUROS_PALDEAN_AQUA_BREED, gMonFrontPic_TaurosAquaBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_COMBAT_BREED, gMonFrontPic_TaurosPaldeanCombatBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_BLAZE_BREED, gMonFrontPic_TaurosPaldeanBlazeBreed), + SPECIES_SPRITE(TAUROS_PALDEAN_AQUA_BREED, gMonFrontPic_TaurosPaldeanAquaBreed), SPECIES_SPRITE(MAGIKARP, gMonFrontPic_Magikarp), SPECIES_SPRITE(GYARADOS, gMonFrontPic_Gyarados), SPECIES_SPRITE(LAPRAS, gMonFrontPic_Lapras), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 48292faf24..f7b0c161b1 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -129,9 +129,9 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(MAGMAR, gMonPalette_Magmar), SPECIES_PAL(PINSIR, gMonPalette_Pinsir), SPECIES_PAL(TAUROS, gMonPalette_Tauros), - SPECIES_PAL(TAUROS_PALDEAN, gMonPalette_TaurosCombatBreed), - SPECIES_PAL(TAUROS_PALDEAN_BLAZE_BREED, gMonPalette_TaurosBlazeBreed), - SPECIES_PAL(TAUROS_PALDEAN_AQUA_BREED, gMonPalette_TaurosAquaBreed), + SPECIES_PAL(TAUROS_PALDEAN_COMBAT_BREED, gMonPalette_TaurosPaldeanCombatBreed), + SPECIES_PAL(TAUROS_PALDEAN_BLAZE_BREED, gMonPalette_TaurosPaldeanBlazeBreed), + SPECIES_PAL(TAUROS_PALDEAN_AQUA_BREED, gMonPalette_TaurosPaldeanAquaBreed), SPECIES_PAL(MAGIKARP, gMonPalette_Magikarp), SPECIES_PAL(GYARADOS, gMonPalette_Gyarados), SPECIES_PAL(LAPRAS, gMonPalette_Lapras), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 6d51e9eead..1a1728b81f 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -129,9 +129,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(MAGMAR, gMonShinyPalette_Magmar), SPECIES_SHINY_PAL(PINSIR, gMonShinyPalette_Pinsir), SPECIES_SHINY_PAL(TAUROS, gMonShinyPalette_Tauros), - SPECIES_SHINY_PAL(TAUROS_PALDEAN, gMonShinyPalette_TaurosCombatBreed), - SPECIES_SHINY_PAL(TAUROS_PALDEAN_BLAZE_BREED, gMonShinyPalette_TaurosBlazeBreed), - SPECIES_SHINY_PAL(TAUROS_PALDEAN_AQUA_BREED, gMonShinyPalette_TaurosAquaBreed), + SPECIES_SHINY_PAL(TAUROS_PALDEAN_COMBAT_BREED, gMonShinyPalette_TaurosPaldeanCombatBreed), + SPECIES_SHINY_PAL(TAUROS_PALDEAN_BLAZE_BREED, gMonShinyPalette_TaurosPaldeanBlazeBreed), + SPECIES_SHINY_PAL(TAUROS_PALDEAN_AQUA_BREED, gMonShinyPalette_TaurosPaldeanAquaBreed), SPECIES_SHINY_PAL(MAGIKARP, gMonShinyPalette_Magikarp), SPECIES_SHINY_PAL(GYARADOS, gMonShinyPalette_Gyarados), SPECIES_SHINY_PAL(LAPRAS, gMonShinyPalette_Lapras), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 83f30dca23..4c59f1bc13 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1149,7 +1149,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"), #endif [SPECIES_WOOPER_PALDEAN] = _("Wooper"), - [SPECIES_TAUROS_PALDEAN] = _("Tauros"), + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = _("Tauros"), // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), diff --git a/src/pokemon.c b/src/pokemon.c index 5896791218..512377fe39 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1499,7 +1499,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE, #endif [SPECIES_WOOPER_PALDEAN - 1] = NATIONAL_DEX_WOOPER, - [SPECIES_TAUROS_PALDEAN - 1] = NATIONAL_DEX_TAUROS, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED - 1] = NATIONAL_DEX_TAUROS, // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU, [SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index a242fc6a51..80fcb3eaa1 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -155,9 +155,9 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_MAGMAR] = gMonIcon_Magmar, [SPECIES_PINSIR] = gMonIcon_Pinsir, [SPECIES_TAUROS] = gMonIcon_Tauros, - [SPECIES_TAUROS_PALDEAN] = gMonIcon_TaurosCombatBreed, - [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = gMonIcon_TaurosBlazeBreed, - [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = gMonIcon_TaurosAquaBreed, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = gMonIcon_TaurosPaldeanCombatBreed, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = gMonIcon_TaurosPaldeanBlazeBreed, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = gMonIcon_TaurosPaldeanAquaBreed, [SPECIES_MAGIKARP] = gMonIcon_Magikarp, [SPECIES_GYARADOS] = gMonIcon_Gyarados, [SPECIES_LAPRAS] = gMonIcon_Lapras,