diff --git a/include/constants/species.h b/include/constants/species.h index 8cf2663ca5..57dab7f532 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1466,7 +1466,8 @@ #define SPECIES_SMOLIV GEN9_START + 23 #define SPECIES_DOLLIV GEN9_START + 24 #define SPECIES_ARBOLIVA GEN9_START + 25 -#define SPECIES_SQUAWKABILLY GEN9_START + 26 +#define SPECIES_SQUAWKABILLY SPECIES_SQUAWKABILLY_GREEN_PLUMAGE +#define SPECIES_SQUAWKABILLY_GREEN_PLUMAGE GEN9_START + 26 #define SPECIES_NACLI GEN9_START + 27 #define SPECIES_NACLSTACK GEN9_START + 28 #define SPECIES_GARGANACL GEN9_START + 29 diff --git a/include/graphics.h b/include/graphics.h index b66f58be66..f792ca862a 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -7565,7 +7565,7 @@ extern const u8 gMonIcon_MausholdFamilyOfThree[]; extern const u8 gMonFootprint_Maushold[]; extern const u32 gMonFrontPic_MausholdFamilyOfFour[]; extern const u32 gMonBackPic_MausholdFamilyOfFour[]; -extern const u32 gMonIcon_MausholdFamilyOfFour[]; +extern const u8 gMonIcon_MausholdFamilyOfFour[]; extern const u32 gMonFrontPic_Fidough[]; extern const u32 gMonPalette_Fidough[]; extern const u32 gMonBackPic_Fidough[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 09eb5dec42..f3cc2edfea 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -7452,7 +7452,6 @@ const u32 gMonPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkolog const u32 gMonBackPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/back.4bpp.lz"); const u32 gMonShinyPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/shiny.gbapal.lz"); const u8 gMonIcon_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/oinkologne/female/icon.4bpp"); -// const u8 gMonFootprint_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp"); const u32 gMonFrontPic_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/front.4bpp.lz"); const u32 gMonPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/normal.gbapal.lz"); @@ -7510,13 +7509,14 @@ const u32 gMonShinyPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/ const u8 gMonIcon_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/icon.4bpp"); // const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/footprint.1bpp"); -const u32 gMonFrontPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz"); const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/normal.gbapal.lz"); -const u32 gMonBackPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.lz"); const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/shiny.gbapal.lz"); -const u8 gMonIcon_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); // const u8 gMonFootprint_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp"); +const u32 gMonFrontPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz"); +const u32 gMonBackPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.lz"); +const u8 gMonIcon_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); + const u32 gMonFrontPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/front.4bpp.lz"); const u32 gMonBackPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/back.4bpp.lz"); const u8 gMonIcon_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/maushold/four/icon.4bpp"); @@ -7557,21 +7557,25 @@ const u8 gMonIcon_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/icon.4bpp"); // const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/footprint.1bpp"); const u32 gMonFrontPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/front.4bpp.lz"); -const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/normal.gbapal.lz"); -const u32 gMonPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/normal.gbapal.lz"); -const u32 gMonPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/normal.gbapal.lz"); -const u32 gMonPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/normal.gbapal.lz"); const u32 gMonBackPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/back.4bpp.lz"); -const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/shiny.gbapal.lz"); -const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/shiny.gbapal.lz"); -const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/shiny.gbapal.lz"); -const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/shiny.gbapal.lz"); -const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/green_plumage/icon.4bpp"); -const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/blue_plumage/icon.4bpp"); -const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/yellow_plumage/icon.4bpp"); -const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/white_plumage/icon.4bpp"); // const u8 gMonFootprint_Squawkabilly[] = INCBIN_U8("graphics/pokemon/squawkabilly/footprint.1bpp"); +const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/normal.gbapal.lz"); +const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/shiny.gbapal.lz"); +const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/green_plumage/icon.4bpp"); + +const u32 gMonPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/normal.gbapal.lz"); +const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/shiny.gbapal.lz"); +const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/blue_plumage/icon.4bpp"); + +const u32 gMonPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/normal.gbapal.lz"); +const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/shiny.gbapal.lz"); +const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/yellow_plumage/icon.4bpp"); + +const u32 gMonPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/normal.gbapal.lz"); +const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/shiny.gbapal.lz"); +const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/white_plumage/icon.4bpp"); + const u32 gMonFrontPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/front.4bpp.lz"); const u32 gMonPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/normal.gbapal.lz"); const u32 gMonBackPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/back.4bpp.lz"); diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 8df0c55c1a..737d7570e3 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -177,8 +177,13 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = #endif #if P_GEN_9_POKEMON == TRUE [SPECIES_OINKOLOGNE_MALE] = sOinkologneFormSpeciesIdTable, + [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFormSpeciesIdTable, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdFormSpeciesIdTable, [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdFormSpeciesIdTable, - [SPECIES_SQUAWKABILLY] = sSquawkabillyFormSpeciesIdTable, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, [SPECIES_PALAFIN] = sPalafinFormSpeciesIdTable, [SPECIES_TATSUGIRI] = sTatsugiriFormSpeciesIdTable, [SPECIES_DUDUNSPARCE] = sDudunsparceFormSpeciesIdTable, @@ -643,14 +648,6 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, #endif #if P_GEN_9_POKEMON == TRUE - // Oinkologne - [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFormSpeciesIdTable, - // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdFormSpeciesIdTable, - // Squawkabilly - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, // Palafin [SPECIES_PALAFIN_HERO] = sPalafinFormSpeciesIdTable, // Tatsugiri diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index eb6b3a71ba..deedb2af5d 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1329,7 +1329,7 @@ static const u16 sMausholdFormSpeciesIdTable[] = { }; static const u16 sSquawkabillyFormSpeciesIdTable[] = { - SPECIES_SQUAWKABILLY, + SPECIES_SQUAWKABILLY_GREEN_PLUMAGE, SPECIES_SQUAWKABILLY_BLUE_PLUMAGE, SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE, SPECIES_SQUAWKABILLY_WHITE_PLUMAGE, diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 952f784cf9..677a8bbb6d 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -928,6 +928,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_QUAQUAVAL] = sQuaquavalLevelUpLearnset, [SPECIES_LECHONK] = sLechonkLevelUpLearnset, [SPECIES_OINKOLOGNE_MALE] = sOinkologneMaleLevelUpLearnset, + [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFemaleLevelUpLearnset, [SPECIES_TAROUNTULA] = sTarountulaLevelUpLearnset, [SPECIES_SPIDOPS] = sSpidopsLevelUpLearnset, [SPECIES_NYMBLE] = sNymbleLevelUpLearnset, @@ -937,12 +938,16 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PAWMOT] = sPawmotLevelUpLearnset, [SPECIES_TANDEMAUS] = sTandemausLevelUpLearnset, [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdLevelUpLearnset, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdLevelUpLearnset, [SPECIES_FIDOUGH] = sFidoughLevelUpLearnset, [SPECIES_DACHSBUN] = sDachsbunLevelUpLearnset, [SPECIES_SMOLIV] = sSmolivLevelUpLearnset, [SPECIES_DOLLIV] = sDollivLevelUpLearnset, [SPECIES_ARBOLIVA] = sArbolivaLevelUpLearnset, - [SPECIES_SQUAWKABILLY] = sSquawkabillyLevelUpLearnset, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = sSquawkabillyLevelUpLearnset, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyLevelUpLearnset, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyLevelUpLearnset, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyLevelUpLearnset, [SPECIES_NACLI] = sNacliLevelUpLearnset, [SPECIES_NACLSTACK] = sNaclstackLevelUpLearnset, [SPECIES_GARGANACL] = sGarganaclLevelUpLearnset, @@ -1482,14 +1487,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, #endif #if P_GEN_9_POKEMON == TRUE - // Oinkologne - [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFemaleLevelUpLearnset, - // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdLevelUpLearnset, - // Squawkabilly - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyLevelUpLearnset, - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyLevelUpLearnset, - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyLevelUpLearnset, // Palafin [SPECIES_PALAFIN_HERO] = sPalafinLevelUpLearnset, // Tatsugiri diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 0dbceafe97..959438a3d0 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -25619,25 +25619,25 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, -#define SQUAWKABILLY_MISC_INFO \ - .baseHP = 82, \ - .baseAttack = 96, \ - .baseDefense = 51, \ - .baseSpeed = 92, \ - .baseSpAttack = 45, \ - .baseSpDefense = 51, \ - .types = { TYPE_NORMAL, TYPE_FLYING }, \ - .catchRate = 190, \ - .expYield = 146, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = 50, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = { EGG_GROUP_FLYING, EGG_GROUP_FLYING}, \ +#define SQUAWKABILLY_MISC_INFO \ + .baseHP = 82, \ + .baseAttack = 96, \ + .baseDefense = 51, \ + .baseSpeed = 92, \ + .baseSpAttack = 45, \ + .baseSpDefense = 51, \ + .types = { TYPE_NORMAL, TYPE_FLYING }, \ + .catchRate = 190, \ + .expYield = 146, \ + .evYield_Attack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 50, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroups = { EGG_GROUP_FLYING, EGG_GROUP_FLYING}, \ .noFlip = FALSE - [SPECIES_SQUAWKABILLY] = + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { .abilities = {ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS}, .bodyColor = BODY_COLOR_GREEN, diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 18e1e227e0..2b0d4e15b1 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -928,6 +928,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_QUAQUAVAL] = sQuaquavalTeachableLearnset, [SPECIES_LECHONK] = sLechonkTeachableLearnset, [SPECIES_OINKOLOGNE_MALE] = sOinkologneMaleTeachableLearnset, + [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFemaleTeachableLearnset, [SPECIES_TAROUNTULA] = sTarountulaTeachableLearnset, [SPECIES_SPIDOPS] = sSpidopsTeachableLearnset, [SPECIES_NYMBLE] = sNymbleTeachableLearnset, @@ -937,12 +938,16 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_PAWMOT] = sPawmotTeachableLearnset, [SPECIES_TANDEMAUS] = sTandemausTeachableLearnset, [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdTeachableLearnset, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdTeachableLearnset, [SPECIES_FIDOUGH] = sFidoughTeachableLearnset, [SPECIES_DACHSBUN] = sDachsbunTeachableLearnset, [SPECIES_SMOLIV] = sSmolivTeachableLearnset, [SPECIES_DOLLIV] = sDollivTeachableLearnset, [SPECIES_ARBOLIVA] = sArbolivaTeachableLearnset, - [SPECIES_SQUAWKABILLY] = sSquawkabillyTeachableLearnset, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = sSquawkabillyTeachableLearnset, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyTeachableLearnset, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyTeachableLearnset, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyTeachableLearnset, [SPECIES_NACLI] = sNacliTeachableLearnset, [SPECIES_NACLSTACK] = sNaclstackTeachableLearnset, [SPECIES_GARGANACL] = sGarganaclTeachableLearnset, @@ -1482,14 +1487,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, #endif #if P_GEN_9_POKEMON == TRUE - // Oinkologne - [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFemaleTeachableLearnset, - // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdTeachableLearnset, - // Squawkabilly - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyTeachableLearnset, - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyTeachableLearnset, - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyTeachableLearnset, // Palafin [SPECIES_PALAFIN_HERO] = sPalafinTeachableLearnset, // Tatsugiri diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 0b778e9a5b..cec525e696 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -971,7 +971,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_DOLLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_ARBOLIVA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index df7f543148..c03db3654e 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1404,7 +1404,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(SMOLIV, gMonBackPic_Smoliv), SPECIES_SPRITE(DOLLIV, gMonBackPic_Dolliv), SPECIES_SPRITE(ARBOLIVA, gMonBackPic_Arboliva), - SPECIES_SPRITE(SQUAWKABILLY, gMonBackPic_Squawkabilly), + SPECIES_SPRITE(SQUAWKABILLY_GREEN_PLUMAGE, gMonBackPic_Squawkabilly), SPECIES_SPRITE(SQUAWKABILLY_BLUE_PLUMAGE, gMonBackPic_Squawkabilly), SPECIES_SPRITE(SQUAWKABILLY_YELLOW_PLUMAGE, gMonBackPic_Squawkabilly), SPECIES_SPRITE(SQUAWKABILLY_WHITE_PLUMAGE, gMonBackPic_Squawkabilly), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index 16f8ee7ed4..b1267a8fcd 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -921,6 +921,7 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = //[SPECIES_QUAQUAVAL] = gMonFootprint_Quaquaval, //[SPECIES_LECHONK] = gMonFootprint_Lechonk, //[SPECIES_OINKOLOGNE_MALE] = gMonFootprint_Oinkologne, + //[SPECIES_OINKOLOGNE_FEMALE] = gMonFootprint_Oinkologne, //[SPECIES_TAROUNTULA] = gMonFootprint_Tarountula, //[SPECIES_SPIDOPS] = gMonFootprint_Spidops, //[SPECIES_NYMBLE] = gMonFootprint_Nymble, @@ -930,12 +931,16 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = //[SPECIES_PAWMOT] = gMonFootprint_Pawmot, //[SPECIES_TANDEMAUS] = gMonFootprint_Tandemaus, //[SPECIES_MAUSHOLD_FAMILY_OF_THREE] = gMonFootprint_Maushold, + //[SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = gMonFootprint_Maushold, //[SPECIES_FIDOUGH] = gMonFootprint_Fidough, //[SPECIES_DACHSBUN] = gMonFootprint_Dachsbun, //[SPECIES_SMOLIV] = gMonFootprint_Smoliv, //[SPECIES_DOLLIV] = gMonFootprint_Dolliv, //[SPECIES_ARBOLIVA] = gMonFootprint_Arboliva, - //[SPECIES_SQUAWKABILLY] = gMonFootprint_Squawkabilly, + //[SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = gMonFootprint_Squawkabilly, + //[SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = gMonFootprint_Squawkabilly, + //[SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = gMonFootprint_Squawkabilly, + //[SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = gMonFootprint_Squawkabilly, //[SPECIES_NACLI] = gMonFootprint_Nacli, //[SPECIES_NACLSTACK] = gMonFootprint_Naclstack, //[SPECIES_GARGANACL] = gMonFootprint_Garganacl, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 586106e8b2..ffe3a71a50 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -13037,6 +13037,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_QUAQUAVAL] = sAnims_Quaquaval, [SPECIES_LECHONK] = sAnims_Lechonk, [SPECIES_OINKOLOGNE_MALE] = sAnims_Oinkologne, + [SPECIES_OINKOLOGNE_FEMALE] = sAnims_Oinkologne, [SPECIES_TAROUNTULA] = sAnims_Tarountula, [SPECIES_SPIDOPS] = sAnims_Spidops, [SPECIES_NYMBLE] = sAnims_Nymble, @@ -13046,12 +13047,16 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_PAWMOT] = sAnims_Pawmot, [SPECIES_TANDEMAUS] = sAnims_Tandemaus, [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sAnims_Maushold, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sAnims_Maushold, [SPECIES_FIDOUGH] = sAnims_Fidough, [SPECIES_DACHSBUN] = sAnims_Dachsbun, [SPECIES_SMOLIV] = sAnims_Smoliv, [SPECIES_DOLLIV] = sAnims_Dolliv, [SPECIES_ARBOLIVA] = sAnims_Arboliva, - [SPECIES_SQUAWKABILLY] = sAnims_Squawkabilly, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = sAnims_Squawkabilly, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sAnims_Squawkabilly, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sAnims_Squawkabilly, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sAnims_Squawkabilly, [SPECIES_NACLI] = sAnims_Nacli, [SPECIES_NACLSTACK] = sAnims_Naclstack, [SPECIES_GARGANACL] = sAnims_Garganacl, @@ -13493,11 +13498,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion, #endif #if P_GEN_9_POKEMON == TRUE - [SPECIES_OINKOLOGNE_FEMALE] = sAnims_Oinkologne, - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sAnims_Maushold, - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sAnims_Squawkabilly, - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sAnims_Squawkabilly, - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sAnims_Squawkabilly, [SPECIES_PALAFIN_HERO] = sAnims_Palafin, [SPECIES_TATSUGIRI_DROOPY] = sAnims_Tatsugiri, [SPECIES_TATSUGIRI_STRETCHY] = sAnims_Tatsugiri, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 2565f9db10..d1eeec9e4f 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -948,7 +948,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_DOLLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ARBOLIVA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { .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 af2c83b64d..d96344ec20 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1402,7 +1402,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(SMOLIV, gMonFrontPic_Smoliv), SPECIES_SPRITE(DOLLIV, gMonFrontPic_Dolliv), SPECIES_SPRITE(ARBOLIVA, gMonFrontPic_Arboliva), - SPECIES_SPRITE(SQUAWKABILLY, gMonFrontPic_Squawkabilly), + SPECIES_SPRITE(SQUAWKABILLY_GREEN_PLUMAGE, gMonFrontPic_Squawkabilly), SPECIES_SPRITE(SQUAWKABILLY_BLUE_PLUMAGE, gMonFrontPic_Squawkabilly), SPECIES_SPRITE(SQUAWKABILLY_YELLOW_PLUMAGE, gMonFrontPic_Squawkabilly), SPECIES_SPRITE(SQUAWKABILLY_WHITE_PLUMAGE, gMonFrontPic_Squawkabilly), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 9ccba0b78b..83c9e225a4 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1402,7 +1402,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(SMOLIV, gMonPalette_Smoliv), SPECIES_PAL(DOLLIV, gMonPalette_Dolliv), SPECIES_PAL(ARBOLIVA, gMonPalette_Arboliva), - SPECIES_PAL(SQUAWKABILLY, gMonPalette_SquawkabillyGreenPlumage), + SPECIES_PAL(SQUAWKABILLY_GREEN_PLUMAGE, gMonPalette_SquawkabillyGreenPlumage), SPECIES_PAL(SQUAWKABILLY_BLUE_PLUMAGE, gMonPalette_SquawkabillyBluePlumage), SPECIES_PAL(SQUAWKABILLY_YELLOW_PLUMAGE, gMonPalette_SquawkabillyYellowPlumage), SPECIES_PAL(SQUAWKABILLY_WHITE_PLUMAGE, gMonPalette_SquawkabillyWhitePlumage), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index ae44820359..10db2ca310 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1401,7 +1401,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(SMOLIV, gMonShinyPalette_Smoliv), SPECIES_SHINY_PAL(DOLLIV, gMonShinyPalette_Dolliv), SPECIES_SHINY_PAL(ARBOLIVA, gMonShinyPalette_Arboliva), - SPECIES_SHINY_PAL(SQUAWKABILLY, gMonShinyPalette_SquawkabillyGreenPlumage), + SPECIES_SHINY_PAL(SQUAWKABILLY_GREEN_PLUMAGE, gMonShinyPalette_SquawkabillyGreenPlumage), SPECIES_SHINY_PAL(SQUAWKABILLY_BLUE_PLUMAGE, gMonShinyPalette_SquawkabillyBluePlumage), SPECIES_SHINY_PAL(SQUAWKABILLY_YELLOW_PLUMAGE, gMonShinyPalette_SquawkabillyYellowPlumage), SPECIES_SHINY_PAL(SQUAWKABILLY_WHITE_PLUMAGE, gMonShinyPalette_SquawkabillyWhitePlumage), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 423df6aa72..62dc633710 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -927,6 +927,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_QUAQUAVAL] = _("Quaquaval"), [SPECIES_LECHONK] = _("Lechonk"), [SPECIES_OINKOLOGNE_MALE] = _("Oinkologne"), + [SPECIES_OINKOLOGNE_FEMALE] = _("Oinkologne"), [SPECIES_TAROUNTULA] = _("Tarountula"), [SPECIES_SPIDOPS] = _("Spidops"), [SPECIES_NYMBLE] = _("Nymble"), @@ -936,12 +937,16 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_PAWMOT] = _("Pawmot"), [SPECIES_TANDEMAUS] = _("Tandemaus"), [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = _("Maushold"), + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = _("Maushold"), [SPECIES_FIDOUGH] = _("Fidough"), [SPECIES_DACHSBUN] = _("Dachsbun"), [SPECIES_SMOLIV] = _("Smoliv"), [SPECIES_DOLLIV] = _("Dolliv"), [SPECIES_ARBOLIVA] = _("Arboliva"), - [SPECIES_SQUAWKABILLY] = _("Squawkabil"), + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = _("Squawkabil"), + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = _("Squawkabil"), + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = _("Squawkabil"), + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = _("Squawkabil"), [SPECIES_NACLI] = _("Nacli"), [SPECIES_NACLSTACK] = _("Naclstack"), [SPECIES_GARGANACL] = _("Garganacl"), @@ -1484,14 +1489,6 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), #endif #if P_GEN_9_POKEMON == TRUE - // Oinkologne - [SPECIES_OINKOLOGNE_FEMALE] = _("Oinkologne"), - // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = _("Maushold"), - // Squawkabilly - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = _("Squawkabil"), - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = _("Squawkabil"), - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = _("Squawkabil"), // Palafin [SPECIES_PALAFIN_HERO] = _("Palafin"), // Tatsugiri diff --git a/src/pokemon.c b/src/pokemon.c index 0fdde4dc88..1303892c9f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1280,6 +1280,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(QUAQUAVAL), SPECIES_TO_NATIONAL(LECHONK), SPECIES_TO_NATIONAL(OINKOLOGNE), + [SPECIES_OINKOLOGNE_FEMALE - 1] = NATIONAL_DEX_OINKOLOGNE, SPECIES_TO_NATIONAL(TAROUNTULA), SPECIES_TO_NATIONAL(SPIDOPS), SPECIES_TO_NATIONAL(NYMBLE), @@ -1289,12 +1290,16 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(PAWMOT), SPECIES_TO_NATIONAL(TANDEMAUS), SPECIES_TO_NATIONAL(MAUSHOLD), + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR - 1] = NATIONAL_DEX_MAUSHOLD, SPECIES_TO_NATIONAL(FIDOUGH), SPECIES_TO_NATIONAL(DACHSBUN), SPECIES_TO_NATIONAL(SMOLIV), SPECIES_TO_NATIONAL(DOLLIV), SPECIES_TO_NATIONAL(ARBOLIVA), SPECIES_TO_NATIONAL(SQUAWKABILLY), + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY, SPECIES_TO_NATIONAL(NACLI), SPECIES_TO_NATIONAL(NACLSTACK), SPECIES_TO_NATIONAL(GARGANACL), @@ -1833,14 +1838,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 - // Oinkologne - [SPECIES_OINKOLOGNE_FEMALE - 1] = NATIONAL_DEX_OINKOLOGNE, - // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR - 1] = NATIONAL_DEX_MAUSHOLD, - // Squawkabilly - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY, - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY, - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY, // Palafin [SPECIES_PALAFIN_HERO - 1] = NATIONAL_DEX_PALAFIN, // Tatsugiri @@ -3077,6 +3074,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_QUAQUAVAL - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_LECHONK - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_OINKOLOGNE_MALE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OINKOLOGNE_FEMALE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TAROUNTULA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SPIDOPS - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_NYMBLE - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -3086,12 +3084,16 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_PAWMOT - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TANDEMAUS - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_MAUSHOLD_FAMILY_OF_THREE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_FIDOUGH - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DACHSBUN - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SMOLIV - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DOLLIV - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ARBOLIVA - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_SQUAWKABILLY - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_NACLI - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_NACLSTACK - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_GARGANACL - 1] = ANIM_V_SQUISH_AND_BOUNCE, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 1d065ea783..7bdf1c9a8f 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1361,7 +1361,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_SMOLIV] = gMonIcon_Smoliv, [SPECIES_DOLLIV] = gMonIcon_Dolliv, [SPECIES_ARBOLIVA] = gMonIcon_Arboliva, - [SPECIES_SQUAWKABILLY] = gMonIcon_SquawkabillyGreenPlumage, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = gMonIcon_SquawkabillyGreenPlumage, [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = gMonIcon_SquawkabillyBluePlumage, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = gMonIcon_SquawkabillyYellowPlumage, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = gMonIcon_SquawkabillyWhitePlumage, @@ -2745,7 +2745,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SMOLIV] = 1, [SPECIES_DOLLIV] = 1, [SPECIES_ARBOLIVA] = 5, - [SPECIES_SQUAWKABILLY] = 1, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = 1, [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = 1, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = 1, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = 1,