From be921c57fcd7f57cc8b6e1244455121cdbeae3fc Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 23 Oct 2023 11:26:50 -0300 Subject: [PATCH] SPECIES_TATSUGIRI_CURLY --- include/constants/species.h | 3 +- src/data/graphics/pokemon.h | 2 - src/data/pokemon/egg_moves.h | 34 ++++++++++- .../pokemon/form_species_table_pointers.h | 10 ++-- src/data/pokemon/form_species_tables.h | 2 +- src/data/pokemon/level_up_learnset_pointers.h | 7 +-- src/data/pokemon/species_info.h | 57 +++++++++++-------- .../pokemon/teachable_learnset_pointers.h | 7 +-- .../pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/back_pic_table.h | 2 +- src/data/pokemon_graphics/footprint_table.h | 4 +- src/data/pokemon_graphics/front_pic_anims.h | 6 +- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_table.h | 2 +- src/data/pokemon_graphics/palette_table.h | 2 +- .../pokemon_graphics/shiny_palette_table.h | 2 +- src/data/text/species_names.h | 7 +-- src/pokemon.c | 9 +-- src/pokemon_icon.c | 6 +- 19 files changed, 102 insertions(+), 64 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index 2f607b4c6a..ed20cc2967 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1515,7 +1515,8 @@ #define SPECIES_CETITAN GEN9_START + 70 #define SPECIES_VELUZA GEN9_START + 71 #define SPECIES_DONDOZO GEN9_START + 72 -#define SPECIES_TATSUGIRI GEN9_START + 73 +#define SPECIES_TATSUGIRI SPECIES_TATSUGIRI_CURLY +#define SPECIES_TATSUGIRI_CURLY GEN9_START + 73 #define SPECIES_ANNIHILAPE GEN9_START + 74 #define SPECIES_CLODSIRE GEN9_START + 75 #define SPECIES_FARIGIRAF GEN9_START + 76 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index ee4a295e73..b92e96fd66 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -7916,14 +7916,12 @@ const u32 gMonPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri const u32 gMonBackPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/back.4bpp.lz"); const u32 gMonShinyPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/shiny.gbapal.lz"); const u8 gMonIcon_TatsugiriDroopy[] = INCBIN_U8("graphics/pokemon/tatsugiri/droopy/icon.4bpp"); -// const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp"); const u32 gMonFrontPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/front.4bpp.lz"); const u32 gMonPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/normal.gbapal.lz"); const u32 gMonBackPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/back.4bpp.lz"); const u32 gMonShinyPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/shiny.gbapal.lz"); const u8 gMonIcon_TatsugiriStretchy[] = INCBIN_U8("graphics/pokemon/tatsugiri/stretchy/icon.4bpp"); -// const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp"); const u32 gMonFrontPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/front.4bpp.lz"); const u32 gMonPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/normal.gbapal.lz"); diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index fe0c85f0c2..576e2cdf9b 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -1,3 +1,5 @@ +#include "constants/moves.h" + #define EGG_MOVES_SPECIES_OFFSET 20000 #define EGG_MOVES_TERMINATOR 0xFFFF #define egg_moves(species, moves...) (SPECIES_##species + EGG_MOVES_SPECIES_OFFSET), moves @@ -4510,7 +4512,25 @@ const u16 gEggMoves[] = { MOVE_SYNTHESIS, MOVE_WEATHER_BALL), - egg_moves(SQUAWKABILLY, + egg_moves(SQUAWKABILLY_GREEN_PLUMAGE, + MOVE_DOUBLE_EDGE, + MOVE_FINAL_GAMBIT, + MOVE_FLATTER, + MOVE_PARTING_SHOT), + + egg_moves(SQUAWKABILLY_BLUE_PLUMAGE, + MOVE_DOUBLE_EDGE, + MOVE_FINAL_GAMBIT, + MOVE_FLATTER, + MOVE_PARTING_SHOT), + + egg_moves(SQUAWKABILLY_YELLOW_PLUMAGE, + MOVE_DOUBLE_EDGE, + MOVE_FINAL_GAMBIT, + MOVE_FLATTER, + MOVE_PARTING_SHOT), + + egg_moves(SQUAWKABILLY_WHITE_PLUMAGE, MOVE_DOUBLE_EDGE, MOVE_FINAL_GAMBIT, MOVE_FLATTER, @@ -4672,7 +4692,17 @@ const u16 gEggMoves[] = { MOVE_THRASH, MOVE_YAWN), - egg_moves(TATSUGIRI, + egg_moves(TATSUGIRI_CURLY, + MOVE_BATON_PASS, + MOVE_COUNTER, + MOVE_RAPID_SPIN), + + egg_moves(TATSUGIRI_DROOPY, + MOVE_BATON_PASS, + MOVE_COUNTER, + MOVE_RAPID_SPIN), + + egg_moves(TATSUGIRI_STRETCHY, MOVE_BATON_PASS, MOVE_COUNTER, MOVE_RAPID_SPIN), diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 308553e1c3..c03f3315ed 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -185,7 +185,10 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, [SPECIES_PALAFIN_ZERO] = sPalafinFormSpeciesIdTable, - [SPECIES_TATSUGIRI] = sTatsugiriFormSpeciesIdTable, + [SPECIES_PALAFIN_HERO] = sPalafinFormSpeciesIdTable, + [SPECIES_TATSUGIRI_CURLY] = sTatsugiriFormSpeciesIdTable, + [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriFormSpeciesIdTable, + [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriFormSpeciesIdTable, [SPECIES_DUDUNSPARCE] = sDudunsparceFormSpeciesIdTable, [SPECIES_GIMMIGHOUL] = sGimmighoulFormSpeciesIdTable, #endif @@ -648,11 +651,6 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, #endif #if P_GEN_9_POKEMON == TRUE - // Palafin - [SPECIES_PALAFIN_HERO] = sPalafinFormSpeciesIdTable, - // Tatsugiri - [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriFormSpeciesIdTable, - [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriFormSpeciesIdTable, // Dudunsparce [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceFormSpeciesIdTable, // Gimmighoul diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 365b927fb5..8d8ef6494a 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1343,7 +1343,7 @@ static const u16 sPalafinFormSpeciesIdTable[] = { }; static const u16 sTatsugiriFormSpeciesIdTable[] = { - SPECIES_TATSUGIRI, + SPECIES_TATSUGIRI_CURLY, SPECIES_TATSUGIRI_DROOPY, SPECIES_TATSUGIRI_STRETCHY, FORM_SPECIES_END, diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 6b3694528c..8aca562132 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -995,7 +995,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CETITAN] = sCetitanLevelUpLearnset, [SPECIES_VELUZA] = sVeluzaLevelUpLearnset, [SPECIES_DONDOZO] = sDondozoLevelUpLearnset, - [SPECIES_TATSUGIRI] = sTatsugiriLevelUpLearnset, + [SPECIES_TATSUGIRI_CURLY] = sTatsugiriLevelUpLearnset, + [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriLevelUpLearnset, + [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriLevelUpLearnset, [SPECIES_ANNIHILAPE] = sAnnihilapeLevelUpLearnset, [SPECIES_CLODSIRE] = sClodsireLevelUpLearnset, [SPECIES_FARIGIRAF] = sFarigirafLevelUpLearnset, @@ -1488,9 +1490,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, #endif #if P_GEN_9_POKEMON == TRUE - // Tatsugiri - [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriLevelUpLearnset, - [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriLevelUpLearnset, // Dudunsparce [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceLevelUpLearnset, // Gimmighoul diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index e648965b7e..5fc278efae 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -26690,31 +26690,40 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, -#define TATSUGIRI_SPECIES_INFO(color) \ - { \ - .baseHP = 68, \ - .baseAttack = 50, \ - .baseDefense = 60, \ - .baseSpeed = 82, \ - .baseSpAttack = 120, \ - .baseSpDefense = 95, \ - .types = { TYPE_DRAGON, TYPE_WATER }, \ - .catchRate = 100, \ - .expYield = 166, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 35, \ - .friendship = 50, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = { EGG_GROUP_WATER_2, EGG_GROUP_WATER_2}, \ - .abilities = {ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN}, \ - .bodyColor = color, \ - .noFlip = FALSE, \ - } +#define TATSUGIRI_MISC_INFO \ + .baseHP = 68, \ + .baseAttack = 50, \ + .baseDefense = 60, \ + .baseSpeed = 82, \ + .baseSpAttack = 120, \ + .baseSpDefense = 95, \ + .types = { TYPE_DRAGON, TYPE_WATER }, \ + .catchRate = 100, \ + .expYield = 166, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 35, \ + .friendship = 50, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = { EGG_GROUP_WATER_2, EGG_GROUP_WATER_2}, \ + .abilities = {ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN},\ + .noFlip = FALSE - [SPECIES_TATSUGIRI] = TATSUGIRI_SPECIES_INFO(BODY_COLOR_PINK), - [SPECIES_TATSUGIRI_DROOPY] = TATSUGIRI_SPECIES_INFO(BODY_COLOR_RED), - [SPECIES_TATSUGIRI_STRETCHY] = TATSUGIRI_SPECIES_INFO(BODY_COLOR_YELLOW), + [SPECIES_TATSUGIRI_CURLY] = + { + TATSUGIRI_MISC_INFO, + .bodyColor = BODY_COLOR_PINK, + }, + [SPECIES_TATSUGIRI_DROOPY] = + { + TATSUGIRI_MISC_INFO, + .bodyColor = BODY_COLOR_RED, + }, + [SPECIES_TATSUGIRI_STRETCHY] = + { + TATSUGIRI_MISC_INFO, + .bodyColor = BODY_COLOR_YELLOW, + }, [SPECIES_ANNIHILAPE] = { diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 293545c525..0c51514cdf 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -995,7 +995,9 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CETITAN] = sCetitanTeachableLearnset, [SPECIES_VELUZA] = sVeluzaTeachableLearnset, [SPECIES_DONDOZO] = sDondozoTeachableLearnset, - [SPECIES_TATSUGIRI] = sTatsugiriTeachableLearnset, + [SPECIES_TATSUGIRI_CURLY] = sTatsugiriTeachableLearnset, + [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriTeachableLearnset, + [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriTeachableLearnset, [SPECIES_ANNIHILAPE] = sAnnihilapeTeachableLearnset, [SPECIES_CLODSIRE] = sClodsireTeachableLearnset, [SPECIES_FARIGIRAF] = sFarigirafTeachableLearnset, @@ -1488,9 +1490,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, #endif #if P_GEN_9_POKEMON == TRUE - // Tatsugiri - [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriTeachableLearnset, - [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriTeachableLearnset, // Dudunsparce [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceTeachableLearnset, // Gimmighoul diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 0193c48e30..0e66759d76 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1021,7 +1021,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_CETITAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_VELUZA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_DONDOZO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, - [SPECIES_TATSUGIRI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, + [SPECIES_TATSUGIRI_CURLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, [SPECIES_TATSUGIRI_DROOPY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, [SPECIES_TATSUGIRI_STRETCHY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, [SPECIES_ANNIHILAPE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index d84ba87d21..f0468c1083 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1455,7 +1455,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(CETITAN, gMonBackPic_Cetitan), SPECIES_SPRITE(VELUZA, gMonBackPic_Veluza), SPECIES_SPRITE(DONDOZO, gMonBackPic_Dondozo), - SPECIES_SPRITE(TATSUGIRI, gMonBackPic_TatsugiriCurly), + SPECIES_SPRITE(TATSUGIRI_CURLY, gMonBackPic_TatsugiriCurly), SPECIES_SPRITE(TATSUGIRI_DROOPY, gMonBackPic_TatsugiriDroopy), SPECIES_SPRITE(TATSUGIRI_STRETCHY, gMonBackPic_TatsugiriStretchy), SPECIES_SPRITE(ANNIHILAPE, gMonBackPic_Annihilape), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index 0e4748c098..8a02ca955a 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -988,7 +988,9 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = //[SPECIES_CETITAN] = gMonFootprint_Cetitan, //[SPECIES_VELUZA] = gMonFootprint_Veluza, //[SPECIES_DONDOZO] = gMonFootprint_Dondozo, - //[SPECIES_TATSUGIRI] = gMonFootprint_Tatsugiri, + //[SPECIES_TATSUGIRI_CURLY] = gMonFootprint_Tatsugiri, + //[SPECIES_TATSUGIRI_DROOPY] = gMonFootprint_Tatsugiri, + //[SPECIES_TATSUGIRI_STRETCHY] = gMonFootprint_Tatsugiri, //[SPECIES_ANNIHILAPE] = gMonFootprint_Annihilape, //[SPECIES_CLODSIRE] = gMonFootprint_Clodsire, //[SPECIES_FARIGIRAF] = gMonFootprint_Farigiraf, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 6d9d9ba265..4d2de05d7f 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -13104,7 +13104,9 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_CETITAN] = sAnims_Cetitan, [SPECIES_VELUZA] = sAnims_Veluza, [SPECIES_DONDOZO] = sAnims_Dondozo, - [SPECIES_TATSUGIRI] = sAnims_Tatsugiri, + [SPECIES_TATSUGIRI_CURLY] = sAnims_Tatsugiri, + [SPECIES_TATSUGIRI_DROOPY] = sAnims_Tatsugiri, + [SPECIES_TATSUGIRI_STRETCHY] = sAnims_Tatsugiri, [SPECIES_ANNIHILAPE] = sAnims_Annihilape, [SPECIES_CLODSIRE] = sAnims_Clodsire, [SPECIES_FARIGIRAF] = sAnims_Farigiraf, @@ -13499,8 +13501,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion, #endif #if P_GEN_9_POKEMON == TRUE - [SPECIES_TATSUGIRI_DROOPY] = sAnims_Tatsugiri, - [SPECIES_TATSUGIRI_STRETCHY] = sAnims_Tatsugiri, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sAnims_Dudunsparce, [SPECIES_GIMMIGHOUL_ROAMING] = sAnims_Gimmighoul, #endif diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index c4bc1e2c14..f37405e0bd 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -999,7 +999,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_CETITAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_VELUZA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DONDOZO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TATSUGIRI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, + [SPECIES_TATSUGIRI_CURLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_TATSUGIRI_DROOPY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_TATSUGIRI_STRETCHY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_ANNIHILAPE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 4bacd7f57c..c695e123d5 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1453,7 +1453,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(CETITAN, gMonFrontPic_Cetitan), SPECIES_SPRITE(VELUZA, gMonFrontPic_Veluza), SPECIES_SPRITE(DONDOZO, gMonFrontPic_Dondozo), - SPECIES_SPRITE(TATSUGIRI, gMonFrontPic_TatsugiriCurly), + SPECIES_SPRITE(TATSUGIRI_CURLY, gMonFrontPic_TatsugiriCurly), SPECIES_SPRITE(TATSUGIRI_DROOPY, gMonFrontPic_TatsugiriDroopy), SPECIES_SPRITE(TATSUGIRI_STRETCHY, gMonFrontPic_TatsugiriStretchy), SPECIES_SPRITE(ANNIHILAPE, gMonFrontPic_Annihilape), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index c2ec2effc1..320961a4e9 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1453,7 +1453,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(CETITAN, gMonPalette_Cetitan), SPECIES_PAL(VELUZA, gMonPalette_Veluza), SPECIES_PAL(DONDOZO, gMonPalette_Dondozo), - SPECIES_PAL(TATSUGIRI, gMonPalette_TatsugiriCurly), + SPECIES_PAL(TATSUGIRI_CURLY, gMonPalette_TatsugiriCurly), SPECIES_PAL(TATSUGIRI_DROOPY, gMonPalette_TatsugiriDroopy), SPECIES_PAL(TATSUGIRI_STRETCHY, gMonPalette_TatsugiriStretchy), SPECIES_PAL(ANNIHILAPE, gMonPalette_Annihilape), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index c368646dcb..78b5bc0344 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1452,7 +1452,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(CETITAN, gMonShinyPalette_Cetitan), SPECIES_SHINY_PAL(VELUZA, gMonShinyPalette_Veluza), SPECIES_SHINY_PAL(DONDOZO, gMonShinyPalette_Dondozo), - SPECIES_SHINY_PAL(TATSUGIRI, gMonShinyPalette_TatsugiriCurly), + SPECIES_SHINY_PAL(TATSUGIRI_CURLY, gMonShinyPalette_TatsugiriCurly), SPECIES_SHINY_PAL(TATSUGIRI_DROOPY, gMonShinyPalette_TatsugiriDroopy), SPECIES_SHINY_PAL(TATSUGIRI_STRETCHY, gMonShinyPalette_TatsugiriStretchy), SPECIES_SHINY_PAL(ANNIHILAPE, gMonShinyPalette_Annihilape), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 9dad421504..171e83d10d 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -994,7 +994,9 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CETITAN] = _("Cetitan"), [SPECIES_VELUZA] = _("Veluza"), [SPECIES_DONDOZO] = _("Dondozo"), - [SPECIES_TATSUGIRI] = _("Tatsugiri"), + [SPECIES_TATSUGIRI_CURLY] = _("Tatsugiri"), + [SPECIES_TATSUGIRI_DROOPY] = _("Tatsugiri"), + [SPECIES_TATSUGIRI_STRETCHY] = _("Tatsugiri"), [SPECIES_ANNIHILAPE] = _("Annihilape"), [SPECIES_CLODSIRE] = _("Clodsire"), [SPECIES_FARIGIRAF] = _("Farigiraf"), @@ -1490,9 +1492,6 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), #endif #if P_GEN_9_POKEMON == TRUE - // Tatsugiri - [SPECIES_TATSUGIRI_DROOPY] = _("Tatsugiri"), - [SPECIES_TATSUGIRI_STRETCHY] = _("Tatsugiri"), // Dudunsparce [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = _("Dudunsparc"), // Gimmighoul diff --git a/src/pokemon.c b/src/pokemon.c index 5cd081f965..6b3abd713e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1348,6 +1348,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(VELUZA), SPECIES_TO_NATIONAL(DONDOZO), SPECIES_TO_NATIONAL(TATSUGIRI), + [SPECIES_TATSUGIRI_DROOPY - 1] = NATIONAL_DEX_TATSUGIRI, + [SPECIES_TATSUGIRI_STRETCHY - 1] = NATIONAL_DEX_TATSUGIRI, SPECIES_TO_NATIONAL(ANNIHILAPE), SPECIES_TO_NATIONAL(CLODSIRE), SPECIES_TO_NATIONAL(FARIGIRAF), @@ -1839,9 +1841,6 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU, #endif #if P_GEN_9_POKEMON == TRUE - // Tatsugiri - [SPECIES_TATSUGIRI_DROOPY - 1] = NATIONAL_DEX_TATSUGIRI, - [SPECIES_TATSUGIRI_STRETCHY - 1] = NATIONAL_DEX_TATSUGIRI, // Dudunsparce [SPECIES_DUDUNSPARCE_THREE_SEGMENT - 1] = NATIONAL_DEX_DUDUNSPARCE, // Gimmighoul @@ -3140,7 +3139,9 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_CETITAN - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_VELUZA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DONDOZO - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_TATSUGIRI - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_TATSUGIRI_CURLY - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_TATSUGIRI_DROOPY - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_TATSUGIRI_STRETCHY - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ANNIHILAPE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CLODSIRE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_FARIGIRAF - 1] = ANIM_V_SQUISH_AND_BOUNCE, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index ecc5551ebb..0a6a2b6c37 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1412,7 +1412,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_CETITAN] = gMonIcon_Cetitan, [SPECIES_VELUZA] = gMonIcon_Veluza, [SPECIES_DONDOZO] = gMonIcon_Dondozo, - [SPECIES_TATSUGIRI] = gMonIcon_TatsugiriCurly, + [SPECIES_TATSUGIRI_CURLY] = gMonIcon_TatsugiriCurly, [SPECIES_TATSUGIRI_DROOPY] = gMonIcon_TatsugiriDroopy, [SPECIES_TATSUGIRI_STRETCHY] = gMonIcon_TatsugiriStretchy, [SPECIES_ANNIHILAPE] = gMonIcon_Annihilape, @@ -2796,7 +2796,9 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CETITAN] = 0, [SPECIES_VELUZA] = 4, [SPECIES_DONDOZO] = 0, - [SPECIES_TATSUGIRI] = 0, // TODO: Forms + [SPECIES_TATSUGIRI_CURLY] = 0, + [SPECIES_TATSUGIRI_DROOPY] = 0, + [SPECIES_TATSUGIRI_STRETCHY] = 0, [SPECIES_ANNIHILAPE] = 0, [SPECIES_CLODSIRE] = 2, [SPECIES_FARIGIRAF] = 0,