From ff60b7ff73f2e132d65fae53a7b17d48492e20df Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 23 Oct 2023 10:24:47 -0300 Subject: [PATCH] Maushold Family of Three define --- include/constants/species.h | 3 +- include/graphics.h | 12 +++--- src/data/graphics/pokemon.h | 12 +++--- src/data/pokemon/evolution.h | 4 +- .../pokemon/form_species_table_pointers.h | 2 +- src/data/pokemon/form_species_tables.h | 2 +- src/data/pokemon/level_up_learnset_pointers.h | 2 +- src/data/pokemon/species_info.h | 42 +++++++++---------- .../pokemon/teachable_learnset_pointers.h | 2 +- .../pokemon_graphics/back_pic_coordinates.h | 4 +- src/data/pokemon_graphics/back_pic_table.h | 4 +- src/data/pokemon_graphics/footprint_table.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 2 +- .../pokemon_graphics/front_pic_coordinates.h | 4 +- src/data/pokemon_graphics/front_pic_table.h | 4 +- src/data/pokemon_graphics/palette_table.h | 2 +- .../pokemon_graphics/shiny_palette_table.h | 2 +- src/data/text/species_names.h | 2 +- src/pokemon.c | 2 +- src/pokemon_icon.c | 7 ++-- 20 files changed, 59 insertions(+), 57 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index 35b8884df4..8cf2663ca5 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1459,7 +1459,8 @@ #define SPECIES_PAWMO GEN9_START + 17 #define SPECIES_PAWMOT GEN9_START + 18 #define SPECIES_TANDEMAUS GEN9_START + 19 -#define SPECIES_MAUSHOLD GEN9_START + 20 +#define SPECIES_MAUSHOLD SPECIES_MAUSHOLD_FAMILY_OF_THREE +#define SPECIES_MAUSHOLD_FAMILY_OF_THREE GEN9_START + 20 #define SPECIES_FIDOUGH GEN9_START + 21 #define SPECIES_DACHSBUN GEN9_START + 22 #define SPECIES_SMOLIV GEN9_START + 23 diff --git a/include/graphics.h b/include/graphics.h index 5e0bfe3429..b66f58be66 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -7557,15 +7557,15 @@ extern const u32 gMonBackPic_Tandemaus[]; extern const u32 gMonShinyPalette_Tandemaus[]; extern const u8 gMonIcon_Tandemaus[]; extern const u8 gMonFootprint_Tandemaus[]; -extern const u32 gMonFrontPic_Maushold[]; +extern const u32 gMonFrontPic_MausholdFamilyOfThree[]; extern const u32 gMonPalette_Maushold[]; -extern const u32 gMonBackPic_Maushold[]; +extern const u32 gMonBackPic_MausholdFamilyOfThree[]; extern const u32 gMonShinyPalette_Maushold[]; -extern const u8 gMonIcon_Maushold[]; +extern const u8 gMonIcon_MausholdFamilyOfThree[]; extern const u8 gMonFootprint_Maushold[]; -extern const u32 gMonFrontPic_MausholdFour[]; -extern const u32 gMonBackPic_MausholdFour[]; -extern const u32 gMonIcon_MausholdFour[]; +extern const u32 gMonFrontPic_MausholdFamilyOfFour[]; +extern const u32 gMonBackPic_MausholdFamilyOfFour[]; +extern const u32 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 3fe7c549c0..09eb5dec42 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -7510,16 +7510,16 @@ 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_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz"); +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_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.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_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); +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_MausholdFour[] = INCBIN_U32("graphics/pokemon/maushold/four/front.4bpp.lz"); -const u32 gMonBackPic_MausholdFour[] = INCBIN_U32("graphics/pokemon/maushold/four/back.4bpp.lz"); -const u8 gMonIcon_MausholdFour[] = INCBIN_U8("graphics/pokemon/maushold/four/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"); const u32 gMonFrontPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/front.4bpp.lz"); const u32 gMonPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/normal.gbapal.lz"); diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index c31a1a5dc1..879f86f3cb 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -553,8 +553,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_NYMBLE] = {{EVO_LEVEL, 24, SPECIES_LOKIX}}, [SPECIES_PAWMI] = {{EVO_LEVEL, 18, SPECIES_PAWMO}}, [SPECIES_PAWMO] = {{EVO_NONE, 0, SPECIES_PAWMOT}}, - [SPECIES_TANDEMAUS] = {{EVO_NONE, 0, SPECIES_MAUSHOLD}, - {EVO_NONE, 0, SPECIES_MAUSHOLD_FAMILY_OF_FOUR}}, + [SPECIES_TANDEMAUS] = {{EVO_NONE, 0, SPECIES_MAUSHOLD_FAMILY_OF_FOUR}, + {EVO_NONE, 0, SPECIES_MAUSHOLD_FAMILY_OF_THREE}}, [SPECIES_FIDOUGH] = {{EVO_LEVEL, 26, SPECIES_DACHSBUN}}, [SPECIES_SMOLIV] = {{EVO_LEVEL, 25, SPECIES_DOLLIV}}, [SPECIES_DOLLIV] = {{EVO_LEVEL, 35, SPECIES_ARBOLIVA}}, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 8d0c4a6c60..8df0c55c1a 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -177,7 +177,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = #endif #if P_GEN_9_POKEMON == TRUE [SPECIES_OINKOLOGNE_MALE] = sOinkologneFormSpeciesIdTable, - [SPECIES_MAUSHOLD] = sMausholdFormSpeciesIdTable, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdFormSpeciesIdTable, [SPECIES_SQUAWKABILLY] = sSquawkabillyFormSpeciesIdTable, [SPECIES_PALAFIN] = sPalafinFormSpeciesIdTable, [SPECIES_TATSUGIRI] = sTatsugiriFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index b49e050b6b..eb6b3a71ba 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1323,7 +1323,7 @@ static const u16 sOinkologneFormSpeciesIdTable[] = { }; static const u16 sMausholdFormSpeciesIdTable[] = { - SPECIES_MAUSHOLD, + SPECIES_MAUSHOLD_FAMILY_OF_THREE, SPECIES_MAUSHOLD_FAMILY_OF_FOUR, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 1677633258..952f784cf9 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -936,7 +936,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PAWMO] = sPawmoLevelUpLearnset, [SPECIES_PAWMOT] = sPawmotLevelUpLearnset, [SPECIES_TANDEMAUS] = sTandemausLevelUpLearnset, - [SPECIES_MAUSHOLD] = sMausholdLevelUpLearnset, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdLevelUpLearnset, [SPECIES_FIDOUGH] = sFidoughLevelUpLearnset, [SPECIES_DACHSBUN] = sDachsbunLevelUpLearnset, [SPECIES_SMOLIV] = sSmolivLevelUpLearnset, diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index af0beef2b5..0dbceafe97 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -25484,29 +25484,29 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, -#define MAUSHOLD_SPECIES_INFO \ - { \ - .baseHP = 74, \ - .baseAttack = 75, \ - .baseDefense = 70, \ - .baseSpeed = 111, \ - .baseSpAttack = 65, \ - .baseSpDefense = 75, \ - .types = { TYPE_NORMAL, TYPE_NORMAL }, \ - .catchRate = 75, \ - .expYield = 165, \ - .evYield_Speed = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 10, \ - .friendship = 50, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FAIRY}, \ - .abilities = {ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN}, \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = FALSE, \ +#define MAUSHOLD_SPECIES_INFO \ + { \ + .baseHP = 74, \ + .baseAttack = 75, \ + .baseDefense = 70, \ + .baseSpeed = 111, \ + .baseSpAttack = 65, \ + .baseSpDefense = 75, \ + .types = { TYPE_NORMAL, TYPE_NORMAL }, \ + .catchRate = 75, \ + .expYield = 165, \ + .evYield_Speed = 2, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 10, \ + .friendship = 50, \ + .growthRate = GROWTH_FAST, \ + .eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FAIRY}, \ + .abilities = {ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN}, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ } - [SPECIES_MAUSHOLD] = MAUSHOLD_SPECIES_INFO, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = MAUSHOLD_SPECIES_INFO, [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = MAUSHOLD_SPECIES_INFO, [SPECIES_FIDOUGH] = diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 80359b22d8..18e1e227e0 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -936,7 +936,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_PAWMO] = sPawmoTeachableLearnset, [SPECIES_PAWMOT] = sPawmotTeachableLearnset, [SPECIES_TANDEMAUS] = sTandemausTeachableLearnset, - [SPECIES_MAUSHOLD] = sMausholdTeachableLearnset, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdTeachableLearnset, [SPECIES_FIDOUGH] = sFidoughTeachableLearnset, [SPECIES_DACHSBUN] = sDachsbunTeachableLearnset, [SPECIES_SMOLIV] = sSmolivTeachableLearnset, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index bf87206704..0b778e9a5b 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -964,8 +964,8 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MAUSHOLD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_DACHSBUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index f47c548856..df7f543148 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1397,8 +1397,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PAWMO, gMonBackPic_Pawmo), SPECIES_SPRITE(PAWMOT, gMonBackPic_Pawmot), SPECIES_SPRITE(TANDEMAUS, gMonBackPic_Tandemaus), - SPECIES_SPRITE(MAUSHOLD, gMonBackPic_Maushold), - SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_FOUR, gMonBackPic_MausholdFour), + SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_THREE, gMonBackPic_MausholdFamilyOfThree), + SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_FOUR, gMonBackPic_MausholdFamilyOfFour), SPECIES_SPRITE(FIDOUGH, gMonBackPic_Fidough), SPECIES_SPRITE(DACHSBUN, gMonBackPic_Dachsbun), SPECIES_SPRITE(SMOLIV, gMonBackPic_Smoliv), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index 4d5b3d5b6a..16f8ee7ed4 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -929,7 +929,7 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = //[SPECIES_PAWMO] = gMonFootprint_Pawmo, //[SPECIES_PAWMOT] = gMonFootprint_Pawmot, //[SPECIES_TANDEMAUS] = gMonFootprint_Tandemaus, - //[SPECIES_MAUSHOLD] = gMonFootprint_Maushold, + //[SPECIES_MAUSHOLD_FAMILY_OF_THREE] = gMonFootprint_Maushold, //[SPECIES_FIDOUGH] = gMonFootprint_Fidough, //[SPECIES_DACHSBUN] = gMonFootprint_Dachsbun, //[SPECIES_SMOLIV] = gMonFootprint_Smoliv, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index d890f62b29..586106e8b2 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -13045,7 +13045,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_PAWMO] = sAnims_Pawmo, [SPECIES_PAWMOT] = sAnims_Pawmot, [SPECIES_TANDEMAUS] = sAnims_Tandemaus, - [SPECIES_MAUSHOLD] = sAnims_Maushold, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sAnims_Maushold, [SPECIES_FIDOUGH] = sAnims_Fidough, [SPECIES_DACHSBUN] = sAnims_Dachsbun, [SPECIES_SMOLIV] = sAnims_Smoliv, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 83028e575c..2565f9db10 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -941,8 +941,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MAUSHOLD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_DACHSBUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index babf0f2054..af2c83b64d 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1395,8 +1395,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PAWMO, gMonFrontPic_Pawmo), SPECIES_SPRITE(PAWMOT, gMonFrontPic_Pawmot), SPECIES_SPRITE(TANDEMAUS, gMonFrontPic_Tandemaus), - SPECIES_SPRITE(MAUSHOLD, gMonFrontPic_Maushold), - SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_FOUR, gMonFrontPic_MausholdFour), + SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_THREE, gMonFrontPic_MausholdFamilyOfThree), + SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_FOUR, gMonFrontPic_MausholdFamilyOfFour), SPECIES_SPRITE(FIDOUGH, gMonFrontPic_Fidough), SPECIES_SPRITE(DACHSBUN, gMonFrontPic_Dachsbun), SPECIES_SPRITE(SMOLIV, gMonFrontPic_Smoliv), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index dc23d32d60..9ccba0b78b 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1395,7 +1395,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(PAWMO, gMonPalette_Pawmo), SPECIES_PAL(PAWMOT, gMonPalette_Pawmot), SPECIES_PAL(TANDEMAUS, gMonPalette_Tandemaus), - SPECIES_PAL(MAUSHOLD, gMonPalette_Maushold), + SPECIES_PAL(MAUSHOLD_FAMILY_OF_THREE, gMonPalette_Maushold), SPECIES_PAL(MAUSHOLD_FAMILY_OF_FOUR, gMonPalette_Maushold), SPECIES_PAL(FIDOUGH, gMonPalette_Fidough), SPECIES_PAL(DACHSBUN, gMonPalette_Dachsbun), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 1ef653e50e..ae44820359 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1394,7 +1394,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(PAWMO, gMonShinyPalette_Pawmo), SPECIES_SHINY_PAL(PAWMOT, gMonShinyPalette_Pawmot), SPECIES_SHINY_PAL(TANDEMAUS, gMonShinyPalette_Tandemaus), - SPECIES_SHINY_PAL(MAUSHOLD, gMonShinyPalette_Maushold), + SPECIES_SHINY_PAL(MAUSHOLD_FAMILY_OF_THREE, gMonShinyPalette_Maushold), SPECIES_SHINY_PAL(MAUSHOLD_FAMILY_OF_FOUR, gMonShinyPalette_Maushold), SPECIES_SHINY_PAL(FIDOUGH, gMonShinyPalette_Fidough), SPECIES_SHINY_PAL(DACHSBUN, gMonShinyPalette_Dachsbun), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 37449ecfa9..423df6aa72 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -935,7 +935,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_PAWMO] = _("Pawmo"), [SPECIES_PAWMOT] = _("Pawmot"), [SPECIES_TANDEMAUS] = _("Tandemaus"), - [SPECIES_MAUSHOLD] = _("Maushold"), + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = _("Maushold"), [SPECIES_FIDOUGH] = _("Fidough"), [SPECIES_DACHSBUN] = _("Dachsbun"), [SPECIES_SMOLIV] = _("Smoliv"), diff --git a/src/pokemon.c b/src/pokemon.c index 84b50de591..0fdde4dc88 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3085,7 +3085,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_PAWMO - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_PAWMOT - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TANDEMAUS - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_MAUSHOLD - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE - 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, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 89cd25358e..1b358c031e 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1354,8 +1354,8 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_PAWMO] = gMonIcon_Pawmo, [SPECIES_PAWMOT] = gMonIcon_Pawmot, [SPECIES_TANDEMAUS] = gMonIcon_Tandemaus, - [SPECIES_MAUSHOLD] = gMonIcon_Maushold, - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = gMonIcon_Maushold, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = gMonIcon_MausholdFamilyOfThree, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = gMonIcon_MausholdFamilyOfThree, [SPECIES_FIDOUGH] = gMonIcon_Fidough, // [SPECIES_DACHSBUN] = gMonIcon_Dachsbun, [SPECIES_SMOLIV] = gMonIcon_Smoliv, @@ -2738,7 +2738,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_PAWMO] = 3, [SPECIES_PAWMOT] = 3, [SPECIES_TANDEMAUS] = 0, - [SPECIES_MAUSHOLD] = 0, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = 0, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = 0, [SPECIES_FIDOUGH] = 1, [SPECIES_DACHSBUN] = 0, // TODO [SPECIES_SMOLIV] = 1,