atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Maushold Family of Three define

Browse source
This commit is contained in:
Eduardo Quezada 2023-10-23 10:24:47 -03:00
parent e6c5077d7c
commit ff60b7ff73
20 changed files with 59 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/constants/species.h
View file

@ -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

12
include/graphics.h
View file

@ -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[];

12
src/data/graphics/pokemon.h
View file

@ -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");

4
src/data/pokemon/evolution.h
View file

@ -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}},

2
src/data/pokemon/form_species_table_pointers.h
View file

@ -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,

2
src/data/pokemon/form_species_tables.h
View file

@ -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,
};

2
src/data/pokemon/level_up_learnset_pointers.h
View file

@ -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,

42
src/data/pokemon/species_info.h
View file

@ -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] =

2
src/data/pokemon/teachable_learnset_pointers.h
View file

@ -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,

4
src/data/pokemon_graphics/back_pic_coordinates.h
View file

@ -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 },

4
src/data/pokemon_graphics/back_pic_table.h
View file

@ -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),

2
src/data/pokemon_graphics/footprint_table.h
View file

@ -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,

2
src/data/pokemon_graphics/front_pic_anims.h
View file

@ -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,

4
src/data/pokemon_graphics/front_pic_coordinates.h
View file

@ -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 },

4
src/data/pokemon_graphics/front_pic_table.h
View file

@ -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),

2
src/data/pokemon_graphics/palette_table.h
View file

@ -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),

2
src/data/pokemon_graphics/shiny_palette_table.h
View file

@ -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),

2
src/data/text/species_names.h
View file

@ -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"),

2
src/pokemon.c
View file

@ -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,

7
src/pokemon_icon.c
View file

@ -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,